diff options
| author | Craig Mautner <cmautner@google.com> | 2014-12-03 20:43:40 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-03 20:43:40 +0000 |
| commit | 62a7022f7d831c166d7ffd198556df4a7f106510 (patch) | |
| tree | 6bba42b2c52c0556a84d5d0b5515d1cdddec64a6 /policy | |
| parent | 8e78f0a7122432c4cfabe86ccf46c724297e11b0 (diff) | |
| parent | 56f10c2685dd6f69c57744896e9bc7db129da447 (diff) | |
| download | frameworks_base-62a7022f7d831c166d7ffd198556df4a7f106510.zip frameworks_base-62a7022f7d831c166d7ffd198556df4a7f106510.tar.gz frameworks_base-62a7022f7d831c166d7ffd198556df4a7f106510.tar.bz2 | |
am 56f10c26: am a9355bd1: Merge "Handle keyguard dismiss flags correctly" into lmp-mr1-dev
* commit '56f10c2685dd6f69c57744896e9bc7db129da447':
Handle keyguard dismiss flags correctly
Diffstat (limited to 'policy')
| -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 e4a5372..f70c7a8 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) { |