From cbd35ab0d5feaa29cc88c45df95f42d7dde2a370 Mon Sep 17 00:00:00 2001 From: Salvador Martinez Date: Tue, 19 Mar 2019 15:20:51 -0700 Subject: [PATCH] Fix sticky battery saver toggle It was persisting to settings secure instead of settings global. Test: robotests pass Bug: 128929858 Change-Id: I8c5bcc875d71096e70f1a70ec84e85d46c3abe43 --- .../batterysaver/BatterySaverStickyPreferenceController.java | 4 ++-- .../BatterySaverStickyPreferenceControllerTest.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverStickyPreferenceController.java b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverStickyPreferenceController.java index b14fec94406..7a1f7f5d6a1 100644 --- a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverStickyPreferenceController.java +++ b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverStickyPreferenceController.java @@ -19,7 +19,7 @@ public class BatterySaverStickyPreferenceController extends BasePreferenceContro @Override public void updateState(Preference preference) { - int setting = Settings.System.getInt(mContext.getContentResolver(), + int setting = Settings.Global.getInt(mContext.getContentResolver(), LOW_POWER_STICKY_AUTO_DISABLE_ENABLED, 1); ((SwitchPreference) preference).setChecked(setting == 0); @@ -28,7 +28,7 @@ public class BatterySaverStickyPreferenceController extends BasePreferenceContro @Override public boolean onPreferenceChange(Preference preference, Object newValue) { boolean keepActive = (Boolean) newValue; - Settings.System.putInt(mContext.getContentResolver(), + Settings.Global.putInt(mContext.getContentResolver(), LOW_POWER_STICKY_AUTO_DISABLE_ENABLED, keepActive ? 0 : 1); return true; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverStickyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverStickyPreferenceControllerTest.java index a441864391e..0ee9cfc5ede 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverStickyPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverStickyPreferenceControllerTest.java @@ -42,7 +42,7 @@ public class BatterySaverStickyPreferenceControllerTest { } private int getAutoDisableSetting() { - return Settings.System.getInt(mContext.getContentResolver(), + return Settings.Global.getInt(mContext.getContentResolver(), LOW_POWER_STICKY_AUTO_DISABLE_ENABLED, 1); }