commit 687e9a1b61885e4cf4458cd15d1a6a28d8653b9b
author Roman Kiryanov <rkir@google.com> Fri Dec 01 21:33:05 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 01 21:33:05 2023 +0000
tree abe113caf32a47f36e37ff8fd8002163e6f8a1ad
parent 6a5b04b2473b10bca5b27cdbac38ea2a171c4f48
parent fbc916ca41f7a0a5866e52044d24260fea711696

Merge "Remove emulator specific code around STAY_ON_WHILE_PLUGGED_IN" into main

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

diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
index ed5654d..ec50323 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
@@ -2432,9 +2432,7 @@
                     R.bool.def_auto_time_zone); // Sync timezone to NITZ
 
             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,
                     R.integer.def_wifi_sleep_policy);