commit 6e4de6ccdf0c0fffa191acf05775d6f87c889d51
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Aug 08 10:48:47 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 08 10:48:47 2017 +0000
tree e6e871fafcc852bd15cf8cda9c96d8e24222fdc2
parent 93bf6200ebd94e93038fbc659276da38d24a951e
parent 97486d25485639f844a07bb6b3ffb02abedc414c

Merge "ScrimController: Wait with clearing wakup animation until done" into oc-dr1-dev

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

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
index 479b945..1d64480 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
@@ -543,7 +543,7 @@
                     mKeyguardFadingOutInProgress = false;
                     mAnimatingDozeUnlock = false;
                 }
-                if (mWakingUpFromAodAnimationRunning) {
+                if (mWakingUpFromAodAnimationRunning && !mDeferFinishedListener) {
                     mWakingUpFromAodAnimationRunning = false;
                     mWakingUpFromAodInProgress = false;
                 }