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

Commit facc7993 authored by Matt Pietal's avatar Matt Pietal Committed by Automerger Merge Worker
Browse files

Merge "SIM PIN unlock - Keyguard in invalid state" into sc-dev am: f9be8149 

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

Change-Id: I0ec10ad7823e3afb88f7e63ba66d8a9b17bc60c0
parents 138507b2 f9be8149

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

+4 −2
Original line number Diff line number Diff line
@@ -1506,8 +1506,10 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable, 
            return;

        }



        // if the keyguard is already showing, don't bother

        if (mKeyguardViewControllerLazy.get().isShowing()) {

        // if the keyguard is already showing, don't bother. check flags in both files

        // to account for the hiding animation which results in a delay and discrepancy

        // between flags

        if (mShowing && mKeyguardViewControllerLazy.get().isShowing()) {

            if (DEBUG) Log.d(TAG, "doKeyguard: not showing because it is already showing");

            resetStateLocked();

            return;