Merge "Should reset mDismissKeyguard on keyguard secure change" into mnc-dev (5b9b66c7) · Commits · e / os / android_frameworks_base

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

+11 −2

Original line number	Diff line number	Diff line
		@@ -497,6 +497,12 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		* 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
		* 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) {
		if (DEBUG_LAYOUT) Slog.v(TAG,
		"Setting mDismissKeyguard true by win " + win);
		mDismissKeyguard = mWinDismissingKeyguard == win ?
		DISMISS_KEYGUARD_CONTINUE : DISMISS_KEYGUARD_START;
		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,
		@@ -4460,6 +4468,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		}
		} else {
		mWinDismissingKeyguard = null;
		mSecureDismissingKeyguard = false;
		mKeyguardHidden = false;
		if (setKeyguardOccludedLw(false)) {
		changes \|= FINISH_LAYOUT_REDO_LAYOUT