Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Should reset mDismissKeyguard on keyguard secure change"

Browse Source
This commit is contained in:
Olawale Ogunwale
2015-06-01 15:00:12 +00:00
committed by Gerrit Code Review
parent ad2be762f2 38cd664c68
commit bf17375e5e
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
View File

@@ -472,6 +472,11 @@ public class PhoneWindowManager implements WindowManagerPolicy {
/** The window that is currently dismissing the keyguard. Dismissing the keyguard must only /** The window that is currently dismissing the keyguard. Dismissing the keyguard must only
* 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
@@ -4094,9 +4099,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
&& mSecureDismissingKeyguard == mKeyguardSecure ?
DISMISS_KEYGUARD_CONTINUE : DISMISS_KEYGUARD_START; 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,
@@ -4250,6 +4257,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