Merge "Recover AOD state when leaving battery saver" into rvc-dev am: f3736be0b3

Change-Id: I3460410a43bb8c1f0d3cface193f4f3cdab91170
2020-03-25 03:05:19 +00:00
parent c0ae0ca544 f3736be0b3
commit e9e64d42fd
1 changed files with 3 additions and 0 deletions
--- a/packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java
+++ b/packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java
@@ -490,6 +490,9 @@ public class DozeTriggers implements DozeMachine.Part {
        public void onPowerSaveChanged(boolean active) {
            if (mDozeHost.isPowerSaveActive()) {
                mMachine.requestState(DozeMachine.State.DOZE);
+            } else if (mMachine.getState() == DozeMachine.State.DOZE
+                    && mConfig.alwaysOnEnabled(UserHandle.USER_CURRENT)) {
+                mMachine.requestState(DozeMachine.State.DOZE_AOD);
            }
        }