diff options
| author | Craig Mautner <cmautner@google.com> | 2014-04-01 13:57:37 -0700 |
|---|---|---|
| committer | Craig Mautner <cmautner@google.com> | 2014-04-01 13:57:37 -0700 |
| commit | 2fc798a2270cda98366776af489d45c1043e831d (patch) | |
| tree | d07a9e7ad1bd2518e1e19549943cfe14fa09173a /policy/src/com/android | |
| parent | dc5e02bdccbbc60ede21ae706f06c696b6983812 (diff) | |
| parent | 8c6e6e7372f26e87b56debc1177debfa4971c00b (diff) | |
| download | frameworks_base-2fc798a2270cda98366776af489d45c1043e831d.zip frameworks_base-2fc798a2270cda98366776af489d45c1043e831d.tar.gz frameworks_base-2fc798a2270cda98366776af489d45c1043e831d.tar.bz2 | |
resolved conflicts for merge of 8c6e6e73 to klp-dev
Change-Id: I9fc9bc3d935e9e730ebca767d848b1c66203f3b4
Diffstat (limited to 'policy/src/com/android')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index d36b8f1..fff0a17 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -3416,8 +3416,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()); @@ -3434,10 +3435,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { mHideLockScreen = true; mForceStatusBarFromKeyguard = false; } - if ((attrs.flags & FLAG_DISMISS_KEYGUARD) != 0 - && mDismissKeyguard == DISMISS_KEYGUARD_NONE) { - if (DEBUG_LAYOUT) Slog.v(TAG, - "Setting mDismissKeyguard true by win " + win); + 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; mWinDismissingKeyguard = win; |