Merge "Fixed issue where camera wouldn't launch" into qt-r1-dev

am: 58432a11f7 Change-Id: I0f40b4bf35c8cc516eef9da37a7988f79bde6f1b
2019-07-31 17:43:17 -07:00
parent a443242ef7 58432a11f7
commit 15a4d3a29f
1 changed files with 2 additions and 1 deletions
--- 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;