From 77aaa80663ea40cf7d25d12bf7c484e6a6135252 Mon Sep 17 00:00:00 2001
From: Lucas Dupin <dupin@google.com>
Date: Wed, 31 Jul 2019 13:33:01 -0700
Subject: [PATCH] Fixed issue where camera wouldn't launch

keyguardIsShowing, passed to NPV#canCameraGestureBeLaunched had the
wrong value because it was checking if SB was expanded visible
but ignoring the fact that bouncer would make it collapse.

Test: manual
Fixes: 138269798
Change-Id: Id259d42cbd7802614318d8f69c80470419f3b54b
Merged-In: Id259d42cbd7802614318d8f69c80470419f3b54b
---
 .../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 5521f1d592d58..8b04890cb01e9 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
@@ -3787,7 +3787,8 @@ public class StatusBar extends SystemUI implements DemoMode,
             return;
         }
         if (!mNotificationPanel.canCameraGestureBeLaunched(
-                mStatusBarKeyguardViewManager.isShowing() && mExpandedVisible)) {
+                mStatusBarKeyguardViewManager.isShowing()
+                        && (mExpandedVisible || mBouncerShowing))) {
             if (DEBUG_CAMERA_LIFT) Slog.d(TAG, "Can't launch camera right now, mExpandedVisible: " +
                     mExpandedVisible);
             return;