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

Commit 5f9a6b67 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Camera: Remove an unused variable mCameraMuteChanged in Camera3Device" into main

parents d65b6a25 845f2b34

services/camera/libcameraservice/device3/Camera3Device.cpp

+0 −2
Original line number Diff line number Diff line
@@ -2937,7 +2937,6 @@ Camera3Device::RequestThread::RequestThread(wp<Camera3Device> parent, 
        mRotateAndCropOverride(ANDROID_SCALER_ROTATE_AND_CROP_NONE),

        mComposerOutput(false),

        mCameraMute(ANDROID_SENSOR_TEST_PATTERN_MODE_OFF),

        mCameraMuteChanged(false),

        mRepeatingLastFrameNumber(

            hardware::camera2::ICameraDeviceUser::NO_IN_FLIGHT_REPEATING_FRAMES),

        mPrepareVideoStream(false),
@@ -4110,7 +4109,6 @@ status_t Camera3Device::RequestThread::setCameraMute(int32_t muteMode) { 
    Mutex::Autolock l(mTriggerMutex);

    if (muteMode != mCameraMute) {

        mCameraMute = muteMode;

        mCameraMuteChanged = true;

    }

    return OK;

}

services/camera/libcameraservice/device3/Camera3Device.h

+0 −1
Original line number Diff line number Diff line
@@ -1085,7 +1085,6 @@ class Camera3Device : 
        camera_metadata_enum_android_scaler_rotate_and_crop_t mRotateAndCropOverride;

        bool               mComposerOutput;

        int32_t            mCameraMute; // 0 = no mute, otherwise the TEST_PATTERN_MODE to use

        bool               mCameraMuteChanged;



        int64_t            mRepeatingLastFrameNumber;