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

Commit 0869abd8 authored by Issei Suzuki's avatar Issei Suzuki Committed by Android (Google) Code Review
Browse files

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

parents e2137ed5 de8442bc

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

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




        final KeyguardDisplayState state = getDisplayState(displayId);

        final KeyguardDisplayState state = getDisplayState(displayId);

        final boolean aodChanged = aodShowing != state.mAodShowing;

        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.

        // 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)

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

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

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

        if (aodChanged && !aodShowing) {

        if (aodRemoved) {

            updateDeferWakeTransition(false /* waiting */);

            updateDeferWakeTransition(false /* waiting */);

        }

        }

        if (!keyguardChanged && !aodChanged) {

        if (!keyguardChanged && !aodChanged) {