From be9df03cbffc90d085c002e98d8cf0a46fcbbeef Mon Sep 17 00:00:00 2001
From: Jason Monk <jmonk@google.com>
Date: Thu, 15 Jun 2017 14:21:34 -0400
Subject: [PATCH] Fix flash of ambient on fp unlock

If we are in fp mode WAKE_AND_UNLOCK assume always set dozing
to false because we may not have received the keyguard callback
yet but we still should be hiding doze content.

Test: Add delay to exit animation callback and use fp unlock
Change-Id: I3d9256482cd5a35f6fa8864577b799432e2ab189
Fixes: 34916735
---
 .../src/com/android/systemui/statusbar/phone/StatusBar.java | 6 ++++++
 1 file changed, 6 insertions(+)

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 cfbdc9241a98c..d1bb6bdbd5887 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
@@ -5041,6 +5041,12 @@ public class StatusBar extends SystemUI implements DemoMode,
         mDozing = mDozingRequested && mState == StatusBarState.KEYGUARD
                 || mFingerprintUnlockController.getMode()
                         == FingerprintUnlockController.MODE_WAKE_AND_UNLOCK_PULSING;
+        // When in wake-and-unlock we may not have received a change to mState
+        // but we still should not be dozing, manually set to false.
+        if (mFingerprintUnlockController.getMode() ==
+                FingerprintUnlockController.MODE_WAKE_AND_UNLOCK) {
+            mDozing = false;
+        }
         mStatusBarWindowManager.setDozing(mDozing);
         updateDozingState();
         Trace.endSection();