commit 384bed509c4f9b327aba1b40e61a2347f036beb2
author Abel Tesfaye <tesfaye@google.com> Wed Jun 09 22:50:13 2021 +0000
committer Abel Tesfaye <tesfaye@google.com> Wed Jun 09 23:11:57 2021 +0000
tree 0cbb064b71bd58b24862b592d404f8bc5210029a
parent c89b3afef5fe9efe22e7595abda3049166de8283

Fix battery saver not disabling adaptive sleep switch

Test: locally with flame

Bug: 189900026
Change-Id: I1f0bc5eb1cd021f1eb8526c020f772ce0dd96da0

src/com/android/settings/display/AdaptiveSleepPreferenceController.java

diff --git a/src/com/android/settings/display/AdaptiveSleepPreferenceController.java b/src/com/android/settings/display/AdaptiveSleepPreferenceController.java
index b86a070..35f9c72 100644
--- a/src/com/android/settings/display/AdaptiveSleepPreferenceController.java
+++ b/src/com/android/settings/display/AdaptiveSleepPreferenceController.java
@@ -90,6 +90,7 @@
         if (enforcedAdmin != null) {
             mPreference.setDisabledByAdmin(enforcedAdmin);
         } else {
+            mPreference.setChecked(isChecked());
             mPreference.setEnabled(hasSufficientPermission(mPackageManager) && !isCameraLocked()
                     && !isPowerSaveMode());
         }

src/com/android/settings/display/ScreenTimeoutSettings.java

diff --git a/src/com/android/settings/display/ScreenTimeoutSettings.java b/src/com/android/settings/display/ScreenTimeoutSettings.java
index b4d120e..66f5ed3 100644
--- a/src/com/android/settings/display/ScreenTimeoutSettings.java
+++ b/src/com/android/settings/display/ScreenTimeoutSettings.java
@@ -81,6 +81,7 @@
         @Override
         public void onReceive(Context context, Intent intent) {
             mAdaptiveSleepBatterySaverPreferenceController.updateVisibility();
+            mAdaptiveSleepController.updatePreference();
         }
     };