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

Commit e1f58785 authored by Olawale Ogunwale's avatar Olawale Ogunwale Committed by Android Git Automerger
Browse files

am bf17375e: Merge "Should reset mDismissKeyguard on keyguard secure change" 

* commit 'bf17375e':
  Should reset mDismissKeyguard on keyguard secure change
parents d147203b bf17375e

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

+9 −1
Original line number Diff line number Diff line
@@ -472,6 +472,11 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    /** The window that is currently dismissing the keyguard. Dismissing the keyguard must only

     * be done once per window. */

    private WindowState mWinDismissingKeyguard;

    /** When window is currently dismissing the keyguard, dismissing the keyguard must handle

     * the keygaurd secure state change instantly case, e.g. the use case of inserting a PIN

     * lock SIM card. This variable is used to record the previous keyguard secure state for

     * monitoring secure state change on window dismissing keyguard. */

    private boolean mSecureDismissingKeyguard;



    /** The window that is currently showing "over" the keyguard. If there is an app window

     * belonging to another app on top of this the keyguard shows. If there is a fullscreen
@@ -4094,9 +4099,11 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                            mDismissKeyguard == DISMISS_KEYGUARD_NONE) {

                        if (DEBUG_LAYOUT) Slog.v(TAG,

                                "Setting mDismissKeyguard true by win " + win);

                        mDismissKeyguard = mWinDismissingKeyguard == win ?

                        mDismissKeyguard = mWinDismissingKeyguard == win

                                && mSecureDismissingKeyguard == mKeyguardSecure ?

                                DISMISS_KEYGUARD_CONTINUE : DISMISS_KEYGUARD_START;

                        mWinDismissingKeyguard = win;

                        mSecureDismissingKeyguard = mKeyguardSecure;

                        mForceStatusBarFromKeyguard = mShowingLockscreen && mKeyguardSecure;

                    } else if (mAppsToBeHidden.isEmpty() && showWhenLocked) {

                        if (DEBUG_LAYOUT) Slog.v(TAG,
@@ -4250,6 +4257,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                }

            } else {

                mWinDismissingKeyguard = null;

                mSecureDismissingKeyguard = false;

                mKeyguardHidden = false;

                if (setKeyguardOccludedLw(false)) {

                    changes |= FINISH_LAYOUT_REDO_LAYOUT