From 4bdab6bb4c55661d4915518b1190e30c4633c6a5 Mon Sep 17 00:00:00 2001 From: Craig Mautner Date: Tue, 1 Apr 2014 12:05:11 -0700 Subject: Fix FLAG_DISMISS_KEYGUARD not working Fixes bug 13672528. Change-Id: I0292aee51d5d8755bbae926e5f0e6af1e22107dc --- policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 6 +++--- 1 file 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 3f4bcd44b6c6..fb6407b314bc 100755 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -2978,8 +2978,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()); @@ -2995,8 +2996,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; -- cgit v1.2.3-59-g8ed1b