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

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

Browse Source 
* commit '56f10c2685dd6f69c57744896e9bc7db129da447':
  Handle keyguard dismiss flags correctly
This commit is contained in:
Craig Mautner
2014-12-03 20:43:40 +00:00
committed by Android Git Automerger
parent 8e78f0a712 56f10c2685
commit 62a7022f7d
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) {