diff options
| author | John Spurlock <jspurlock@google.com> | 2012-08-25 09:51:40 -0400 |
|---|---|---|
| committer | John Spurlock <jspurlock@google.com> | 2012-08-25 09:51:40 -0400 |
| commit | 4fde81f7e70da4d2b84f8d60c738cad885663dec (patch) | |
| tree | b7af7db35385fc82d664a7b1817c0f77529fb223 /core/java/android | |
| parent | 4d3a7b075298d1379e9d6ba84bc02a347344a001 (diff) | |
| download | frameworks_base-4fde81f7e70da4d2b84f8d60c738cad885663dec.zip frameworks_base-4fde81f7e70da4d2b84f8d60c738cad885663dec.tar.gz frameworks_base-4fde81f7e70da4d2b84f8d60c738cad885663dec.tar.bz2 | |
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
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/service/dreams/DreamManagerService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/service/dreams/DreamManagerService.java b/core/java/android/service/dreams/DreamManagerService.java index 4b0f7c5..2cec6c3 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 |