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

2012-08-25 07:06:08 -07:00
parent ba94170a7a 4fde81f7e7
commit 3782aabe4e
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/service/dreams/DreamManagerService.java
+++ b/core/java/android/service/dreams/DreamManagerService.java
@@ -105,7 +105,7 @@ public class DreamManagerService
    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