diff options
| author | Craig Mautner <cmautner@google.com> | 2014-12-03 19:49:46 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-03 19:49:46 +0000 |
| commit | 56f10c2685dd6f69c57744896e9bc7db129da447 (patch) | |
| tree | 5b9b49bb8d2e0023349c68a334a5fc8b70f681d1 /policy/src | |
| parent | 9aa9e46b4e02e5f39752d93a3aa0645ede056fa9 (diff) | |
| parent | a9355bd1c5d80777172103bd4e694972fedf8e54 (diff) | |
| download | frameworks_base-56f10c2685dd6f69c57744896e9bc7db129da447.zip frameworks_base-56f10c2685dd6f69c57744896e9bc7db129da447.tar.gz frameworks_base-56f10c2685dd6f69c57744896e9bc7db129da447.tar.bz2 | |
am a9355bd1: Merge "Handle keyguard dismiss flags correctly" into lmp-mr1-dev
* commit 'a9355bd1c5d80777172103bd4e694972fedf8e54':
Handle keyguard dismiss flags correctly
Diffstat (limited to 'policy/src')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index 11c6edd..c3500e2 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -4049,12 +4049,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) { |