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

am 41ec0400: Merge "Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED" into lmp-mr1-dev

Browse Source 
* commit '41ec0400056daa97d40bd4a8225b7d4f0d665598':
  Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED
This commit is contained in:
Craig Mautner
2014-12-02 21:20:17 +00:00
committed by Android Git Automerger
parent 15b2d9ab44 41ec040005
commit e4e7d2cdf4
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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