diff options
| author | Craig Mautner <cmautner@google.com> | 2014-04-01 22:27:00 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-01 22:27:00 +0000 |
| commit | b67c41d281b13626e04595dc830941e47b7a3dbd (patch) | |
| tree | aaeb776ab4af52988dc32efa483d4ab35600c60c /policy | |
| parent | 624818b0c133ac619996b2f0553b20fa060f6487 (diff) | |
| parent | 74ee938dcc5e1ab0309dd87278e26f604c756b26 (diff) | |
| download | frameworks_base-b67c41d281b13626e04595dc830941e47b7a3dbd.zip frameworks_base-b67c41d281b13626e04595dc830941e47b7a3dbd.tar.gz frameworks_base-b67c41d281b13626e04595dc830941e47b7a3dbd.tar.bz2 | |
am 74ee938d: resolved conflicts for merge of ffb22827 to master
* commit '74ee938dcc5e1ab0309dd87278e26f604c756b26':
Fix FLAG_DISMISS_KEYGUARD not working
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 928fd9b..026d44e 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -3415,8 +3415,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { } final boolean showWhenLocked = (fl & FLAG_SHOW_WHEN_LOCKED) != 0; + final boolean dismissKeyguard = (fl & FLAG_DISMISS_KEYGUARD) != 0; if (appWindow) { - if (showWhenLocked) { + if (showWhenLocked || (dismissKeyguard && !isKeyguardSecure())) { mAppsToBeHidden.remove(win.getAppToken()); } else { mAppsToBeHidden.add(win.getAppToken()); @@ -3433,8 +3434,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { mHideLockScreen = true; mForceStatusBarFromKeyguard = false; } - if ((fl & 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 ? |