Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a848249 authored by Josh Tsuji's avatar Josh Tsuji Committed by Automerger Merge Worker
Browse files

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

Merge "Fix wakeAndUnlock immediately after sleep." into tm-dev am: bbc60f74 am: 52f9f20c am: b9da886d

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17982124



Change-Id: I2704784a8a411da0a3963057093ebc5888a5354e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6ff42c4c b9da886d

packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java

+7 −0
Original line number Diff line number Diff line
@@ -4473,6 +4473,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();

                }