Skip to content

Commit 4fde81f

Browse files
author
John Spurlock
committed
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
1 parent 4d3a7b0 commit 4fde81f

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

core/java/android/service/dreams/DreamManagerService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ private static ComponentName[] componentsFromString(String names) {
105105
public ComponentName[] getDreamComponents() {
106106
// TODO(dsandler) don't load this every time, watch the value
107107
String names = Settings.Secure.getString(mContext.getContentResolver(), SCREENSAVER_COMPONENTS);
108-
return componentsFromString(names);
108+
return names == null ? null : componentsFromString(names);
109109
}
110110

111111
// IDreamManager method

0 commit comments

Comments
 (0)