diff options
| author | Craig Mautner <cmautner@google.com> | 2014-04-01 19:43:41 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-01 19:43:41 +0000 |
| commit | efbe7cc0ff5c85cc7956bb3099402c7ebbe20591 (patch) | |
| tree | 1a17b2af78f75f529f77b3d3d13efd1a6948ce6a /policy/src/com/android | |
| parent | e0b94d1cf16c11406554edd035c7e1bef6d2b844 (diff) | |
| parent | d1c82f8fc22216e9b544e3a3b521bcad05bc113d (diff) | |
| download | frameworks_base-efbe7cc0ff5c85cc7956bb3099402c7ebbe20591.zip frameworks_base-efbe7cc0ff5c85cc7956bb3099402c7ebbe20591.tar.gz frameworks_base-efbe7cc0ff5c85cc7956bb3099402c7ebbe20591.tar.bz2 | |
am d1c82f8f: am 1cb3c1d3: am fc80fbe3: am 7bd0b652: am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working
* commit 'd1c82f8fc22216e9b544e3a3b521bcad05bc113d':
Fix FLAG_DISMISS_KEYGUARD not working
Diffstat (limited to 'policy/src/com/android')
| -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 1ff0c00..91971e3 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -2997,8 +2997,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { } final boolean showWhenLocked = (attrs.flags & FLAG_SHOW_WHEN_LOCKED) != 0; + final boolean dismissKeyguard = (attrs.flags & FLAG_DISMISS_KEYGUARD) != 0; if (appWindow) { - if (showWhenLocked) { + if (showWhenLocked || (dismissKeyguard && !isKeyguardSecure())) { mAppsToBeHidden.remove(win.getAppToken()); } else { mAppsToBeHidden.add(win.getAppToken()); @@ -3014,8 +3015,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { mHideLockScreen = true; mForceStatusBarFromKeyguard = false; } - if ((attrs.flags & FLAG_DISMISS_KEYGUARD) != 0 - && mDismissKeyguard == DISMISS_KEYGUARD_NONE) { + if (dismissKeyguard && mDismissKeyguard == DISMISS_KEYGUARD_NONE) { if (DEBUG_LAYOUT) Slog.v(TAG, "Setting mDismissKeyguard true by win " + win); mDismissKeyguard = mWinDismissingKeyguard == win ? DISMISS_KEYGUARD_CONTINUE : DISMISS_KEYGUARD_START; |