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

Commit 142e533e authored by Louis Chang's avatar Louis Chang Committed by Automerger Merge Worker
Browse files

Merge "Do not count AOD showing changes as keyguard's" into rvc-dev am: 9e8c7bd6 am: 902da749 

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

Change-Id: I9ee0e4f7f7562b74dab6717fc1b9d39c5f2878be
parents 53424494 902da749

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

+4 −3
Original line number Diff line number Diff line
@@ -133,10 +133,11 @@ class KeyguardController { 
     * Update the Keyguard showing state.

     */

    void setKeyguardShown(boolean keyguardShowing, boolean aodShowing) {

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

        final boolean keyguardChanged = keyguardShowing != mKeyguardShowing

                || mKeyguardGoingAway && keyguardShowing;

        final boolean aodChanged = aodShowing != mAodShowing;

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

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

        final boolean keyguardChanged = (keyguardShowing != mKeyguardShowing)

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

        if (!keyguardChanged && !aodChanged) {

            return;

        }