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

This commit is contained in:
Lucas Dupin
2019-08-01 00:09:52 +00:00
committed by Android (Google) Code Review

View File

@@ -3787,7 +3787,8 @@ public class StatusBar extends SystemUI implements DemoMode,
return; return;
} }
if (!mNotificationPanel.canCameraGestureBeLaunched( if (!mNotificationPanel.canCameraGestureBeLaunched(
mStatusBarKeyguardViewManager.isShowing() && mExpandedVisible)) { mStatusBarKeyguardViewManager.isShowing()
&& (mExpandedVisible || mBouncerShowing))) {
if (DEBUG_CAMERA_LIFT) Slog.d(TAG, "Can't launch camera right now, mExpandedVisible: " + if (DEBUG_CAMERA_LIFT) Slog.d(TAG, "Can't launch camera right now, mExpandedVisible: " +
mExpandedVisible); mExpandedVisible);
return; return;