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

Commit 0a14103e 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 

am: 4f5252bd

Change-Id: I431da0e6ffaa90f1071f9170b92bafcfdfa7ab30
parents c1af399b 4f5252bd

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;