Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 15a4d3a2 authored by Lucas Dupin's avatar Lucas Dupin Committed by android-build-merger
Browse files

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

am: 58432a11

Change-Id: I0f40b4bf35c8cc516eef9da37a7988f79bde6f1b
parents a443242e 58432a11

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java

+2 −1
Original line number Diff line number Diff line
@@ -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;