diff options
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java | 4 | ||||
| -rw-r--r-- | services/core/java/com/android/server/dreams/DreamManagerService.java | 13 |
2 files changed, 7 insertions, 10 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java index dec3245a102f..dc7632dbc4a9 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -1176,8 +1176,6 @@ class DatabaseHelper extends SQLiteOpenHelper { com.android.internal.R.bool.config_dreamsActivatedOnDockByDefault); loadBooleanSetting(stmt, Settings.Secure.SCREENSAVER_ACTIVATE_ON_SLEEP, com.android.internal.R.bool.config_dreamsActivatedOnSleepByDefault); - loadStringSetting(stmt, Settings.Secure.SCREENSAVER_COMPONENTS, - com.android.internal.R.string.config_dreamsDefaultComponent); loadStringSetting(stmt, Settings.Secure.SCREENSAVER_DEFAULT_COMPONENT, com.android.internal.R.string.config_dreamsDefaultComponent); @@ -2362,8 +2360,6 @@ class DatabaseHelper extends SQLiteOpenHelper { com.android.internal.R.bool.config_dreamsActivatedOnDockByDefault); loadBooleanSetting(stmt, Settings.Secure.SCREENSAVER_ACTIVATE_ON_SLEEP, com.android.internal.R.bool.config_dreamsActivatedOnSleepByDefault); - loadStringSetting(stmt, Settings.Secure.SCREENSAVER_COMPONENTS, - com.android.internal.R.string.config_dreamsDefaultComponent); loadStringSetting(stmt, Settings.Secure.SCREENSAVER_DEFAULT_COMPONENT, com.android.internal.R.string.config_dreamsDefaultComponent); diff --git a/services/core/java/com/android/server/dreams/DreamManagerService.java b/services/core/java/com/android/server/dreams/DreamManagerService.java index 258689a3ed93..611b28850efe 100644 --- a/services/core/java/com/android/server/dreams/DreamManagerService.java +++ b/services/core/java/com/android/server/dreams/DreamManagerService.java @@ -484,14 +484,15 @@ public final class DreamManagerService extends SystemService { } private static String componentsToString(ComponentName[] componentNames) { + if (componentNames == null) { + return null; + } StringBuilder names = new StringBuilder(); - if (componentNames != null) { - for (ComponentName componentName : componentNames) { - if (names.length() > 0) { - names.append(','); - } - names.append(componentName.flattenToString()); + for (ComponentName componentName : componentNames) { + if (names.length() > 0) { + names.append(','); } + names.append(componentName.flattenToString()); } return names.toString(); } |