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

Merge changes from topic "no-nudge-if-dream-selected"

Browse Source 
* changes:
  Fix bug that the dream is set to "" when null is passed.
  Don't set initial value for SCREENSAVER_COMPONENTS.
This commit is contained in:
Xiaowen Lei
2022-01-26 18:28:39 +00:00
committed by Android (Google) Code Review
parent 2d7b60e99c a272643fa0
commit a49a494a58
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
View File

@@ -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);

13
services/core/java/com/android/server/dreams/DreamManagerService.java
View File

@@ -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();
}