commit f5bc41408e47da362dcf789d580f1399ce040e0f
author Matt Pietal <mpietal@google.com> Fri Mar 03 19:28:16 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Mon Mar 06 01:29:49 2023 +0000
tree 469db2515953aa6efc3bbad0685bff8286c025a3
parent c40db3fe9f91803d58a3215a6f0cdd5945869e94

Notify ScreenOffController of battery saver change

It was previously listening for AOD setting changes only, and
ingorning when the battery saver was disabling AOD. This caused
animations to run (showAodUI) that put statusbarstate into a stuck
KEYGUARD state when it should've been SHADE.

Fixes: 270910479
Test: atest DozeParametersTest
Test: manual, start with unfolded device, turn on batter saver, fold
it, and then unlock

Change-Id: Iae586f9a2b86f19502f3d66165b633b1c9fc5f7f
(cherry picked from commit 10383655a4396253c238a4c2d44b9d4511737629)
Merged-In: Iae586f9a2b86f19502f3d66165b633b1c9fc5f7f

packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java
index b88531e..ae715b3 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java
@@ -429,7 +429,6 @@
         }
 
         dispatchAlwaysOnEvent();
-        mScreenOffAnimationController.onAlwaysOnChanged(getAlwaysOn());
     }
 
     @Override
@@ -469,6 +468,7 @@
         for (Callback callback : mCallbacks) {
             callback.onAlwaysOnChange();
         }
+        mScreenOffAnimationController.onAlwaysOnChanged(getAlwaysOn());
     }
 
     private boolean getPostureSpecificBool(

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/DozeParametersTest.java

diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/DozeParametersTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/DozeParametersTest.java
index eb5edbc..f5b7ca8 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/DozeParametersTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/DozeParametersTest.java
@@ -180,6 +180,7 @@
         when(mAmbientDisplayConfiguration.alwaysOnEnabled(anyInt())).thenReturn(true);
         mDozeParameters.onTuningChanged(Settings.Secure.DOZE_ALWAYS_ON, "1");
 
+        verify(mScreenOffAnimationController).onAlwaysOnChanged(false);
         assertThat(mDozeParameters.getAlwaysOn()).isFalse();
     }
 
@@ -196,13 +197,16 @@
         mBatteryStateChangeCallback.getValue().onPowerSaveChanged(true);
 
         verify(callback, times(2)).onAlwaysOnChange();
+        verify(mScreenOffAnimationController, times(2)).onAlwaysOnChanged(false);
         assertThat(mDozeParameters.getAlwaysOn()).isFalse();
 
+        reset(mScreenOffAnimationController);
         reset(callback);
         when(mBatteryController.isAodPowerSave()).thenReturn(false);
         mBatteryStateChangeCallback.getValue().onPowerSaveChanged(true);
 
         verify(callback).onAlwaysOnChange();
+        verify(mScreenOffAnimationController).onAlwaysOnChanged(true);
         assertThat(mDozeParameters.getAlwaysOn()).isTrue();
     }