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

Commit fa3fba7e authored by Issei Suzuki's avatar Issei Suzuki Committed by Automerger Merge Worker
Browse files

Merge "Reset keyguardGoingAway status when AOD is showing." into tm-qpr-dev... 

Merge "Reset keyguardGoingAway status when AOD is showing." into tm-qpr-dev am: 0869abd8 am: d995482c

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



Change-Id: Ib0b5e0525e083eb1a5ec1bc4dbeb6bb065642f91
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 542af895 d995482c

services/core/java/com/android/server/wm/KeyguardController.java

+4 −3
Original line number Diff line number Diff line
@@ -170,11 +170,12 @@ class KeyguardController { 


        final KeyguardDisplayState state = getDisplayState(displayId);

        final boolean aodChanged = aodShowing != state.mAodShowing;

        final boolean aodRemoved = state.mAodShowing && !aodShowing;

        // If keyguard is going away, but SystemUI aborted the transition, need to reset state.

        // Do not reset keyguardChanged status if this is aodChanged.

        // Do not reset keyguardChanged status when only AOD is removed.

        final boolean keyguardChanged = (keyguardShowing != state.mKeyguardShowing)

                || (state.mKeyguardGoingAway && keyguardShowing && !aodChanged);

        if (aodChanged && !aodShowing) {

                || (state.mKeyguardGoingAway && keyguardShowing && !aodRemoved);

        if (aodRemoved) {

            updateDeferWakeTransition(false /* waiting */);

        }

        if (!keyguardChanged && !aodChanged) {