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

Merge "Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED" into lmp-mr1-dev

Browse Source
This commit is contained in:
Craig Mautner
2014-12-02 21:13:58 +00:00
committed by Android (Google) Code Review
parent 4e779ecd56 ca0a124da0
commit 41ec040005
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4054,10 +4054,14 @@ public class PhoneWindowManager implements WindowManagerPolicy {
// Remove any previous windows with the same appToken. // Remove any previous windows with the same appToken.
mAppsToBeHidden.remove(appToken); mAppsToBeHidden.remove(appToken);
mAppsThatDismissKeyguard.remove(appToken); mAppsThatDismissKeyguard.remove(appToken);
if (mAppsToBeHidden.isEmpty() && mKeyguardSecureIncludingHidden) { if (mAppsToBeHidden.isEmpty()) {
if (mKeyguardSecureIncludingHidden) {
mWinShowWhenLocked = win; mWinShowWhenLocked = win;
mHideLockScreen = true; mHideLockScreen = true;
mForceStatusBarFromKeyguard = false; mForceStatusBarFromKeyguard = false;
} else if (dismissKeyguard && !mKeyguardSecure) {
mAppsThatDismissKeyguard.add(appToken);
}
} }
} else if (dismissKeyguard) { } else if (dismissKeyguard) {
if (mKeyguardSecure) { if (mKeyguardSecure) {