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

Commit bbe03c71 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:... 

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

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

Change-Id: I7dc74243aef32fe3195cc8e6c9133240bd8fd583
parents 1950096e 36895f68

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;

        }