Merge "DreamManagerService: Handle missing db value" into jb-mr1-dev

John Spurlock · Android (Google) Code Review · commit 3782aabe4e0e · 2012-08-25T07:06:08.000-07:00
diff --git a/core/java/android/service/dreams/DreamManagerService.java b/core/java/android/service/dreams/DreamManagerService.java
@@ -105,7 +105,7 @@ private static ComponentName[] componentsFromString(String names) {
     public ComponentName[] getDreamComponents() {
         // TODO(dsandler) don't load this every time, watch the value
         String names = Settings.Secure.getString(mContext.getContentResolver(), SCREENSAVER_COMPONENTS);
-        return componentsFromString(names);
+        return names == null ? null : componentsFromString(names);
     }
 
     // IDreamManager method

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ private static ComponentName[] componentsFromString(String names) {`
`105`	`105`	`public ComponentName[] getDreamComponents() {`
`106`	`106`	`// TODO(dsandler) don't load this every time, watch the value`
`107`	`107`	`String names = Settings.Secure.getString(mContext.getContentResolver(), SCREENSAVER_COMPONENTS);`
`108`		`- return componentsFromString(names);`
	`108`	`+ return names == null ? null : componentsFromString(names);`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`// IDreamManager method`