Merge "Fix wakeAndUnlock immediately after sleep." into tm-dev am: bbc60f7400 am: 03fa2b8edf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17982124 Change-Id: Ib948b73464c63598457be12692637fe674c87bc8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -4473,6 +4473,13 @@ public class CentralSurfacesImpl extends CoreStartable implements
|
|||||||
updateDozingState();
|
updateDozingState();
|
||||||
mDozeServiceHost.updateDozing();
|
mDozeServiceHost.updateDozing();
|
||||||
updateScrimController();
|
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();
|
updateReportRejectedTouchVisibility();
|
||||||
Trace.endSection();
|
Trace.endSection();
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user