Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
John Spurlock
2012-08-25 07:06:08 -07:00
committed by Android (Google) Code Review
parent ba94170a7a 4fde81f7e7
commit 3782aabe4e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/service/dreams/DreamManagerService.java
View File

@@ -105,7 +105,7 @@ public class DreamManagerService
public ComponentName[] getDreamComponents() { public ComponentName[] getDreamComponents() {
// TODO(dsandler) don't load this every time, watch the value // TODO(dsandler) don't load this every time, watch the value
String names = Settings.Secure.getString(mContext.getContentResolver(), SCREENSAVER_COMPONENTS); String names = Settings.Secure.getString(mContext.getContentResolver(), SCREENSAVER_COMPONENTS);
return componentsFromString(names); return names == null ? null : componentsFromString(names);
} }
// IDreamManager method // IDreamManager method