From 97486d25485639f844a07bb6b3ffb02abedc414c Mon Sep 17 00:00:00 2001
From: Adrian Roos <roosa@google.com>
Date: Mon, 7 Aug 2017 16:55:46 +0200
Subject: [PATCH] ScrimController: Wait with clearing wakup animation until
 done

Fixes an issue where if another animation was started during
the wakeupFromDoze animation, the scrim would flash white
because the original animation got canceled. Instead now wait
until the animation is actually completed, not just altered.

Change-Id: I7738ec838d77f78dde2c5810369c50b4fafaeb67
Fixes: 64412754
Test: Trigger assistant from AOD; verify there is no white flash.
---
 .../com/android/systemui/statusbar/phone/ScrimController.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 479b94546e14e..1d6448094132c 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 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener,
                     mKeyguardFadingOutInProgress = false;
                     mAnimatingDozeUnlock = false;
                 }
-                if (mWakingUpFromAodAnimationRunning) {
+                if (mWakingUpFromAodAnimationRunning && !mDeferFinishedListener) {
                     mWakingUpFromAodAnimationRunning = false;
                     mWakingUpFromAodInProgress = false;
                 }