From abe15d4ec47fb563fb570a9ca84196e34611c1cc Mon Sep 17 00:00:00 2001
From: Lucas Dupin <dupin@google.com>
Date: Tue, 24 Mar 2020 18:14:35 -0700
Subject: [PATCH] Recover AOD state when leaving battery saver

We need to anable AOD again when the device is placed on a charger and
AOD was disabled by battery saver.

Test: manual
Fixes: 146879388
Change-Id: Iea0a48d8eb51239b751941bf76eb2630a86ceb11
---
 .../SystemUI/src/com/android/systemui/doze/DozeTriggers.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java b/packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java
index 09d7d26e4dfed..b3299916356cc 100644
--- 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);
             }
         }