diff options
| author | Craig Mautner <cmautner@google.com> | 2014-04-01 19:18:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-01 19:18:36 +0000 |
| commit | 7bd0b65233d0ef34114ecb93d734dfe4351f470d (patch) | |
| tree | c6e3904ba9ff23df393bee0bcd9630dc9dc5ff57 /policy/src/com/android | |
| parent | 95d6e32bc3c5382740a6bb418f77cf7147d833f7 (diff) | |
| parent | 4bdab6bb4c55661d4915518b1190e30c4633c6a5 (diff) | |
| download | frameworks_base-7bd0b65233d0ef34114ecb93d734dfe4351f470d.zip frameworks_base-7bd0b65233d0ef34114ecb93d734dfe4351f470d.tar.gz frameworks_base-7bd0b65233d0ef34114ecb93d734dfe4351f470d.tar.bz2 | |
am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working
* commit '4bdab6bb4c55661d4915518b1190e30c4633c6a5':
Fix FLAG_DISMISS_KEYGUARD not working
Diffstat (limited to 'policy/src/com/android')
| -rwxr-xr-x | 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 0076468..156676a 100755 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -2989,8 +2989,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()); @@ -3006,8 +3007,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; |