commit 5584737fff6350ab09fb53e6a73bbff770930727
author John Spurlock <jspurlock@google.com> Tue Apr 16 13:23:47 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 16 13:23:47 2013 +0000
tree a3f1eefce34749a626f43e34bb7878ade63f4e0b
parent 83d90b200babe43d5e91cef1bbcf0b224f48e16d
parent 3733c4c2fec9f69d48a13a82d5bade3926248efa

Merge "FLAG_DISMISS_KEYGUARD should not hide status bar if secure." into jb-mr2-dev

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
index 273ac31..7cb6b09 100644
--- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -3204,7 +3204,8 @@
                     mDismissKeyguard = mWinDismissingKeyguard == win ?
                             DISMISS_KEYGUARD_CONTINUE : DISMISS_KEYGUARD_START;
                     mWinDismissingKeyguard = win;
-                    mForceStatusBarFromKeyguard = false;
+                    mForceStatusBarFromKeyguard =
+                            mShowingLockscreen && mKeyguardMediator.isSecure();
                 }
                 if ((attrs.flags & FLAG_ALLOW_LOCK_WHILE_SCREEN_ON) != 0) {
                     mAllowLockscreenWhenOn = true;