commit f144f6ecd9386eba9cb516bec42c07295e3f9765
author Adrian Roos <roosa@google.com> Mon Aug 21 22:07:05 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Aug 21 22:07:05 2017 +0000
tree d75123cba56948ee6b27ec41847b4c53e298bd8e
parent 3403673123f70c93d9fca457fefa571ebb134fb9
parent b9afae2e50c0240ee103ab44fad13b75aef985b6

Merge "AOD: Only play wakeup animation when actually waking up" into oc-mr1-dev

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java

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 4fb5754..db4ea50 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
@@ -5261,8 +5261,7 @@
 
     private void maybePrepareWakeUpFromAod() {
         int wakefulness = mWakefulnessLifecycle.getWakefulness();
-        if (mDozing && (wakefulness == WAKEFULNESS_WAKING
-                || wakefulness == WAKEFULNESS_ASLEEP) && !isPulsing()) {
+        if (mDozing && wakefulness == WAKEFULNESS_WAKING && !isPulsing()) {
             mScrimController.prepareWakeUpFromAod();
         }
     }