From 3733c4c2fec9f69d48a13a82d5bade3926248efa Mon Sep 17 00:00:00 2001
From: John Spurlock <jspurlock@google.com>
Date: Thu, 11 Apr 2013 16:55:12 -0400
Subject: [PATCH] FLAG_DISMISS_KEYGUARD should not hide status bar if secure.

Otherwise, setting both FLAG_DISMISS_KEYGUARD + FLAG_FULLSCREEN
will hide the status bar (by not forcing it) when the secure
keyguard is showing.

Bug:8567697
Change-Id: I441d9c1bc0e106672b6d29427d291f41eaf1e697
---
 .../com/android/internal/policy/impl/PhoneWindowManager.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
index 273ac310a9aa0..7cb6b09a8001b 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 @@ public class PhoneWindowManager implements WindowManagerPolicy {
                     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;