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

am: 6e4de6ccdf Change-Id: I1eb1c997c551461ff09efd1f3ea35276cbb4d43d
2017-08-08 10:57:18 +00:00
parent aa73a69d3a 6e4de6ccdf
commit 3d8fd6e4b9
1 changed files with 1 additions and 1 deletions
--- 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 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener,
                    mKeyguardFadingOutInProgress = false;
                    mAnimatingDozeUnlock = false;
                }
-                if (mWakingUpFromAodAnimationRunning) {
+                if (mWakingUpFromAodAnimationRunning && !mDeferFinishedListener) {
                    mWakingUpFromAodAnimationRunning = false;
                    mWakingUpFromAodInProgress = false;
                }