From 8924a8d9bf3f67d2e86795fb310d65e50ca3e045 Mon Sep 17 00:00:00 2001
From: Lucas Dupin <dupin@google.com>
Date: Wed, 5 Dec 2018 19:07:31 -0800
Subject: [PATCH] Fix issue where Keyguard would not be dismissed

Keyguard would not be dismissed if showing locked with a bouncer
while a HUN is visible.

Test: manual
Change-Id: Ib13847ad0e2bcce08907eaad74860b987cd9f899
Fixes: 119929970
---
 .../src/com/android/systemui/statusbar/phone/StatusBar.java    | 3 ++-
 1 file changed, 2 insertions(+), 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 962e214d8c217..96ec6be1f9574 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
@@ -2527,7 +2527,7 @@ public class StatusBar extends SystemUI implements DemoMode,
                 }
             }
             if (dismissShade) {
-                if (mExpandedVisible) {
+                if (mExpandedVisible && !mBouncerShowing) {
                     animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_RECENTS_PANEL, true /* force */,
                             true /* delayed*/);
                 } else {
@@ -3208,6 +3208,7 @@ public class StatusBar extends SystemUI implements DemoMode,
         mNotificationPanel.onAffordanceLaunchEnded();
         mNotificationPanel.animate().cancel();
         mNotificationPanel.setAlpha(1f);
+        updateScrimController();
         Trace.endSection();
         return staying;
     }