diff options
| author | 2023-12-01 22:23:07 +0000 | |
|---|---|---|
| committer | 2023-12-01 22:23:07 +0000 | |
| commit | db71bc076c718bcb5a60d2f5860b67f0f976282b (patch) | |
| tree | 06f2a5967675972b4c376640a8ce8c9916a2deac | |
| parent | be9a024bdea58aa183a88e7a0f50f53626f912b6 (diff) | |
| parent | 687e9a1b61885e4cf4458cd15d1a6a28d8653b9b (diff) | |
Merge "Remove emulator specific code around STAY_ON_WHILE_PLUGGED_IN" into main am: 687e9a1b61
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2855848
Change-Id: Ibddd715569d945a7ee921a92fe692e7434c47252
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java index ed5654d4f259..ec50323dd91d 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 @@ class DatabaseHelper extends SQLiteOpenHelper { 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); |