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

Commit 2f9c08d1 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: b492e87e

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

Change-Id: I124e665bc2a40a63ee8df40f9eaeb4ff1f6a2ca3
parents 1950096e b492e87e

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

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

     * Update the Keyguard showing state.

     */

     */

    void setKeyguardShown(boolean keyguardShowing, boolean aodShowing) {

    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;

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

        if (!keyguardChanged && !aodChanged) {

            return;

            return;

        }

        }