Merge "Fix wakeAndUnlock immediately after sleep." into tm-dev

1 files changed, 7 insertions, 0 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java
index e4efb98528fe..ef24d7793562 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java
@@ -4456,6 +4456,13 @@ public class CentralSurfacesImpl extends CoreStartable implements
                     updateDozingState();
                     mDozeServiceHost.updateDozing();
                     updateScrimController();
+
+                    if (mBiometricUnlockController.isWakeAndUnlock()) {
+                        // Usually doze changes are to/from lockscreen/AOD, but if we're wake and
+                        // unlocking we should hide the keyguard ASAP if necessary.
+                        updateIsKeyguard();
+                    }
+
                     updateReportRejectedTouchVisibility();
                     Trace.endSection();
                 }