diff options
| author | John Spurlock <jspurlock@google.com> | 2012-08-25 07:06:08 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-25 07:06:08 -0700 |
| commit | 3782aabe4e0e67839e8a03b694abf6433fd2d65d (patch) | |
| tree | 8dca8f439bc736cb4907616caa6c16844774ab7a /core | |
| parent | ba94170a7a4f78d68fe228e9ee35ed82c4de09c8 (diff) | |
| parent | 4fde81f7e70da4d2b84f8d60c738cad885663dec (diff) | |
| download | frameworks_base-3782aabe4e0e67839e8a03b694abf6433fd2d65d.zip frameworks_base-3782aabe4e0e67839e8a03b694abf6433fd2d65d.tar.gz frameworks_base-3782aabe4e0e67839e8a03b694abf6433fd2d65d.tar.bz2 | |
Merge "DreamManagerService: Handle missing db value" into jb-mr1-dev
Diffstat (limited to 'core')
| -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 |