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

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

Browse Source 
* commit 'a9355bd1c5d80777172103bd4e694972fedf8e54':
  Handle keyguard dismiss flags correctly
This commit is contained in:
Craig Mautner
2014-12-03 19:49:46 +00:00
committed by Android Git Automerger
parent 9aa9e46b4e a9355bd1c5
commit 56f10c2685
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

@@ -4049,12 +4049,12 @@ public class PhoneWindowManager implements WindowManagerPolicy {
mAppsToBeHidden.remove(appToken); mAppsToBeHidden.remove(appToken);
mAppsThatDismissKeyguard.remove(appToken); mAppsThatDismissKeyguard.remove(appToken);
if (mAppsToBeHidden.isEmpty()) { if (mAppsToBeHidden.isEmpty()) {
if (mKeyguardSecureIncludingHidden) { if (dismissKeyguard && !mKeyguardSecure) {
mAppsThatDismissKeyguard.add(appToken);
} else {
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) {