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

2017-08-21 22:07:05 +00:00
parent 3403673123 b9afae2e50
commit f144f6ecd9
1 changed files with 1 additions and 2 deletions
--- 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 @@ 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();
        }
    }