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

Commit 4f95004b authored by Adrian Roos's avatar Adrian Roos Committed by android-build-merger
Browse files

Merge "Keyguard: fix possible divergent state" into pi-dev am: 5d8dfe17 

am: a6d97163

Change-Id: Ib514eb5efd239d3659229339a34a7f651607bf50
parents 36de63d4 a6d97163

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+2 −0
Original line number Diff line number Diff line
@@ -1854,6 +1854,8 @@ public class KeyguardViewMediator extends SystemUI { 
        synchronized (KeyguardViewMediator.this) {



            if (!mHiding) {

                // Tell ActivityManager that we canceled the keyguardExitAnimation.

                setShowingLocked(mShowing, mAodShowing, mSecondaryDisplayShowing, true /* force */);

                return;

            }

            mHiding = false;

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

+2 −0
Original line number Diff line number Diff line
@@ -121,6 +121,8 @@ class KeyguardController { 
    void setKeyguardShown(boolean keyguardShowing, boolean aodShowing,

            int secondaryDisplayShowing) {

        boolean showingChanged = keyguardShowing != mKeyguardShowing || aodShowing != mAodShowing;

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

        showingChanged |= mKeyguardGoingAway && keyguardShowing;

        if (!showingChanged && secondaryDisplayShowing == mSecondaryDisplayShowing) {

            return;

        }