From 4fde81f7e70da4d2b84f8d60c738cad885663dec Mon Sep 17 00:00:00 2001 From: John Spurlock Date: Sat, 25 Aug 2012 09:51:40 -0400 Subject: [PATCH] DreamManagerService: Handle missing db value Should not happen (except for early dogfooders with a specific build), but handle gracefully as we do elsewhere in dream manager. To test: adb shell sqlite3 \ /data/data/com.android.providers.settings/databases/settings.db \ "delete from secure where name = 'screensaver_components'" Pre-fix workaround: adb shell sqlite3 \ /data/data/com.android.providers.settings/databases/settings.db \ "insert into secure(name, value) values ('screensaver_components', \ 'com.google.android.deskclock/com.android.deskclock.Screensaver')" Change-Id: I2cf39608c8dd5011f6a00deece95eb6554da5173 --- core/java/android/service/dreams/DreamManagerService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/java/android/service/dreams/DreamManagerService.java b/core/java/android/service/dreams/DreamManagerService.java index 4b0f7c5288195..2cec6c3dff547 100644 --- 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