From f24aff4171899021a95782ece2c2499468e64591 Mon Sep 17 00:00:00 2001
From: Evan Laird <evanlaird@google.com>
Date: Tue, 15 May 2018 17:32:15 -0400
Subject: [PATCH] Check mStatusBarWindowHidden bit when deciding to hide status
 bar

Ensures that we unhide status bar icons when (for instance), showing the
status bar in the camera from the keyguard

Change-Id: Ica1b622dd9e0a913575664b98825bc67809e5e72
Fixes: 79511463
Bug: 79700037 (possibly related)
Test: launch camera from keyguard, swipe status bar down, see icons
---
 .../src/com/android/systemui/statusbar/phone/StatusBar.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
index 65cb56c7cc138..bb53e14f0d5b3 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
@@ -2081,7 +2081,7 @@ public class StatusBar extends SystemUI implements DemoMode,
      * @param animate should the change of the icons be animated.
      */
     private void updateHideIconsForBouncer(boolean animate) {
-        boolean hideBecauseApp = mTopHidesStatusBar && mIsOccluded;
+        boolean hideBecauseApp = mTopHidesStatusBar && mIsOccluded && mStatusBarWindowHidden;
         boolean hideBecauseKeyguard = !mPanelExpanded && !mIsOccluded && mBouncerShowing;
         boolean shouldHideIconsForBouncer = hideBecauseApp || hideBecauseKeyguard;
         if (mHideIconsForBouncer != shouldHideIconsForBouncer) {