From 107702b267dc24d883a550385bce52e9222c85c7 Mon Sep 17 00:00:00 2001
From: Josh Tsuji <tsuji@google.com>
Date: Mon, 21 Jun 2021 15:01:45 -0400
Subject: [PATCH] Fix AOD2 notifications not waking up the device if the screen
 off animation played.

KeyguardViewMediator's isAnimatingScreenOff isn't always reset when going to sleep - it's sometimes only reset to false onStartedWakingUp. I'll fix that in a subsequent CL, but just in case that's a load-bearing bug, we'll do this first.

Fixes: 191231505
Test: tap notif on AOD2 after screen off plays
Change-Id: Ic13fbbaec9151ff577fc9914df1cbb9c42245ded
---
 .../src/com/android/systemui/statusbar/phone/StatusBar.java   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
index 5d2fe523c8034..1e6c2233874ca 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
@@ -1473,9 +1473,7 @@ public class StatusBar extends SystemUI implements DemoMode,
      * @param why the reason for the wake up
      */
     public void wakeUpIfDozing(long time, View where, String why) {
-        if (mDozing && !(mKeyguardViewMediator.isAnimatingScreenOff()
-                || mUnlockedScreenOffAnimationController
-                    .isScreenOffLightRevealAnimationPlaying())) {
+        if (mDozing && !mUnlockedScreenOffAnimationController.isScreenOffAnimationPlaying()) {
             mPowerManager.wakeUp(
                     time, PowerManager.WAKE_REASON_GESTURE, "com.android.systemui:" + why);
             mWakeUpComingFromTouch = true;