Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a49a494a authored by Xiaowen Lei's avatar Xiaowen Lei Committed by Android (Google) Code Review
Browse files

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

* changes:
  Fix bug that the dream is set to "" when null is passed.
  Don't set initial value for SCREENSAVER_COMPONENTS.
parents 2d7b60e9 a272643f

packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java

+0 −4
Original line number Diff line number Diff line
@@ -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);

services/core/java/com/android/server/dreams/DreamManagerService.java

+7 −6
Original line number Diff line number Diff line
@@ -484,15 +484,16 @@ 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());

        }

        }

        return names.toString();

    }