diff options
| author | Craig Mautner <cmautner@google.com> | 2014-04-01 15:20:16 -0700 |
|---|---|---|
| committer | Craig Mautner <cmautner@google.com> | 2014-04-01 15:20:16 -0700 |
| commit | 74ee938dcc5e1ab0309dd87278e26f604c756b26 (patch) | |
| tree | 81ac28791643042b58536ccb504f690a111c2286 /policy | |
| parent | 4126693be37244116d23e9c6dce2a15b88ad988f (diff) | |
| parent | ffb22827d74fcb7872a912ca022800a9b0818695 (diff) | |
| download | frameworks_base-74ee938dcc5e1ab0309dd87278e26f604c756b26.zip frameworks_base-74ee938dcc5e1ab0309dd87278e26f604c756b26.tar.gz frameworks_base-74ee938dcc5e1ab0309dd87278e26f604c756b26.tar.bz2 | |
resolved conflicts for merge of ffb22827 to master
Change-Id: Ia01028203dfe87df91c828d681289e92b9371e3c
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 ededbb2..ccdacea 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -3417,8 +3417,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()); @@ -3435,8 +3436,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 ? |