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

Commit df0b6baa authored by Roman Kiryanov's avatar Roman Kiryanov Committed by Automerger Merge Worker
Browse files

Merge "Remove emulator specific code around STAY_ON_WHILE_PLUGGED_IN" into... 

Merge "Remove emulator specific code around STAY_ON_WHILE_PLUGGED_IN" into main am: 687e9a1b am: db71bc07

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2855848



Change-Id: I46bbeeddc34ed2100c9b6eb185b3cb0eb3783314
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2564dd37 db71bc07

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

+1 −3
Original line number Original line Diff line number Diff line
@@ -2432,9 +2432,7 @@ class DatabaseHelper extends SQLiteOpenHelper { 
                    R.bool.def_auto_time_zone); // Sync timezone to NITZ

                    R.bool.def_auto_time_zone); // Sync timezone to NITZ





            loadSetting(stmt, Settings.Global.STAY_ON_WHILE_PLUGGED_IN,

            loadSetting(stmt, Settings.Global.STAY_ON_WHILE_PLUGGED_IN,

                    ("1".equals(SystemProperties.get("ro.boot.qemu"))

                    res.getBoolean(R.bool.def_stay_on_while_plugged_in) ? 1 : 0);

                        || res.getBoolean(R.bool.def_stay_on_while_plugged_in))

                     ? 1 : 0);





            loadIntegerSetting(stmt, Settings.Global.WIFI_SLEEP_POLICY,

            loadIntegerSetting(stmt, Settings.Global.WIFI_SLEEP_POLICY,

                    R.integer.def_wifi_sleep_policy);

                    R.integer.def_wifi_sleep_policy);