diff options
| author | Craig Mautner <cmautner@google.com> | 2014-04-01 12:05:11 -0700 |
|---|---|---|
| committer | The Android Automerger <android-build@android.com> | 2014-04-01 15:15:06 -0700 |
| commit | 9d6b121a4ededf003822bdfe7b12d7812a13d0ca (patch) | |
| tree | 0b82f8f374fcd35dde14001ec9e467ac32846ba1 | |
| parent | ba5f1f27890cea44b13cb79b50c2c3176d916708 (diff) | |
| download | base-9d6b121a4ededf003822bdfe7b12d7812a13d0ca.tar.gz | |
Fix FLAG_DISMISS_KEYGUARD not working
Fixes bug 13672528.
Change-Id: I0292aee51d5d8755bbae926e5f0e6af1e22107dc
Conflicts:
policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
| -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 d36b8f1a3855..fff0a1789be2 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; |