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

* commit '3782aabe4e0e67839e8a03b694abf6433fd2d65d': DreamManagerService: Handle missing db value
2012-08-25 07:08:32 -07:00
parent baebcd36e9 3782aabe4e
commit 5f738ed3ff
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