From 365835ff4ee01a648b13948683e850921c4a982a Mon Sep 17 00:00:00 2001 From: Adrian Roos Date: Mon, 21 Aug 2017 17:17:20 +0200 Subject: [PATCH] AOD: Only play wakeup animation when actually waking up Fixes an issue where the wake up animation could play when going to sleep, if the screen turning on for AOD happened after the finishing going to sleep. Change-Id: I6b00aaefb672a630f43ca229d6cc66d12bc4205c Fixes: 64814671 Test: Pull up app launcher, turn off screen, verify AOD does not blink. (cherry picked from commit b9afae2e50c0240ee103ab44fad13b75aef985b6) --- .../src/com/android/systemui/statusbar/phone/StatusBar.java | 3 +-- 1 file changed, 1 insertion(+), 2 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 3d2213bf56e85..ada98b7a2ca38 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java @@ -5236,8 +5236,7 @@ public class StatusBar extends SystemUI implements DemoMode, private void maybePrepareWakeUpFromAod() { int wakefulness = mWakefulnessLifecycle.getWakefulness(); - if (mDozing && (wakefulness == WAKEFULNESS_WAKING - || wakefulness == WAKEFULNESS_ASLEEP) && !isPulsing()) { + if (mDozing && wakefulness == WAKEFULNESS_WAKING && !isPulsing()) { mScrimController.prepareWakeUpFromAod(); } }