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

Change-Id: Ie5c9e9eb5ae963b20455dfe61b7efffe7e82d5fc
2020-03-25 03:27:55 +00:00
parent 08cf16be39 a67f54935a
commit 4a429defb1
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);
            }
        }