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

Commit 5b9b66c7 authored by Olawale Ogunwale's avatar Olawale Ogunwale Committed by Android (Google) Code Review
Browse files

Merge "Should reset mDismissKeyguard on keyguard secure change" into mnc-dev

parents cdc7bf10 e785ffa0

services/core/java/com/android/server/policy/PhoneWindowManager.java

+11 −2
Original line number Original line Diff line number Diff line
@@ -497,6 +497,12 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
     * be done once per window. */

     * be done once per window. */

    private WindowState mWinDismissingKeyguard;

    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

    /** 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

     * belonging to another app on top of this the keyguard shows. If there is a fullscreen

     * app window under this, still dismiss the keyguard but don't show the app underneath. Show

     * app window under this, still dismiss the keyguard but don't show the app underneath. Show
@@ -4272,9 +4278,11 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                            mDismissKeyguard == DISMISS_KEYGUARD_NONE) {

                            mDismissKeyguard == DISMISS_KEYGUARD_NONE) {

                        if (DEBUG_LAYOUT) Slog.v(TAG,

                        if (DEBUG_LAYOUT) Slog.v(TAG,

                                "Setting mDismissKeyguard true by win " + win);

                                "Setting mDismissKeyguard true by win " + win);

                        mDismissKeyguard = mWinDismissingKeyguard == win ?

                        mDismissKeyguard = (mWinDismissingKeyguard == win

                                DISMISS_KEYGUARD_CONTINUE : DISMISS_KEYGUARD_START;

                                && mSecureDismissingKeyguard == mKeyguardSecure)

                                ? DISMISS_KEYGUARD_CONTINUE : DISMISS_KEYGUARD_START;

                        mWinDismissingKeyguard = win;

                        mWinDismissingKeyguard = win;

                        mSecureDismissingKeyguard = mKeyguardSecure;

                        mForceStatusBarFromKeyguard = mShowingLockscreen && mKeyguardSecure;

                        mForceStatusBarFromKeyguard = mShowingLockscreen && mKeyguardSecure;

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

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

                        if (DEBUG_LAYOUT) Slog.v(TAG,

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

                }

            } else {

            } else {

                mWinDismissingKeyguard = null;

                mWinDismissingKeyguard = null;

                mSecureDismissingKeyguard = false;

                mKeyguardHidden = false;

                mKeyguardHidden = false;

                if (setKeyguardOccludedLw(false)) {

                if (setKeyguardOccludedLw(false)) {

                    changes |= FINISH_LAYOUT_REDO_LAYOUT

                    changes |= FINISH_LAYOUT_REDO_LAYOUT