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

Merge "Handle keyguard dismiss flags correctly" into lmp-mr1-dev

Browse Source
This commit is contained in:
Craig Mautner
2014-12-03 18:41:28 +00:00
committed by Android (Google) Code Review
parent 5244ab68e4 192d60488f
commit a9355bd1c5
1 changed files with 3 additions and 3 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

@@ -4055,12 +4055,12 @@ public class PhoneWindowManager implements WindowManagerPolicy {
mAppsToBeHidden.remove(appToken);
mAppsThatDismissKeyguard.remove(appToken);
if (mAppsToBeHidden.isEmpty()) {
if (mKeyguardSecureIncludingHidden) {
if (dismissKeyguard && !mKeyguardSecure) {
mAppsThatDismissKeyguard.add(appToken);
} else {
mWinShowWhenLocked = win;
mHideLockScreen = true;
mForceStatusBarFromKeyguard = false;
} else if (dismissKeyguard && !mKeyguardSecure) {
mAppsThatDismissKeyguard.add(appToken);
}
}
} else if (dismissKeyguard) {