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

Commit 72e8f9de authored by Xiaowen Lei's avatar Xiaowen Lei
Browse files

Don't set initial value for SCREENSAVER_COMPONENTS. 

We need to use SCREENSAVER_COMPONENTS==null to indicate that the user
hasn't selected a dream.

Test: atest NudgeToSetupDreamCallbackTest
Test: manually flash device and run
Bug: 213368707
Change-Id: I7140197690d266fbd70cf38cd7a96f175b247a75
parent fd015869

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