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

Commit 19f693e9 authored by Shuzhen Wang's avatar Shuzhen Wang Committed by Automerger Merge Worker
Browse files

Merge "Camera: Remove an unused variable mCameraMuteChanged in Camera3Device"... 

Merge "Camera: Remove an unused variable mCameraMuteChanged in Camera3Device" into aosp-main-future am: e8c706c0 am: e3f48ace am: 40d74e65

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/24723665



Change-Id: I10bcbbabc8e5e7610630dd1a66089880936634c9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7ccbb9ab 40d74e65

services/camera/libcameraservice/device3/Camera3Device.cpp

+0 −2
Original line number Diff line number Diff line
@@ -3045,7 +3045,6 @@ Camera3Device::RequestThread::RequestThread(wp<Camera3Device> parent, 
        mAutoframingOverride(ANDROID_CONTROL_AUTOFRAMING_OFF),

        mComposerOutput(false),

        mCameraMute(ANDROID_SENSOR_TEST_PATTERN_MODE_OFF),

        mCameraMuteChanged(false),

        mSettingsOverride(ANDROID_CONTROL_SETTINGS_OVERRIDE_OFF),

        mRepeatingLastFrameNumber(

            hardware::camera2::ICameraDeviceUser::NO_IN_FLIGHT_REPEATING_FRAMES),
@@ -4243,7 +4242,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
@@ -1157,7 +1157,6 @@ class Camera3Device : 
        camera_metadata_enum_android_control_autoframing_t mAutoframingOverride;

        bool               mComposerOutput;

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

        bool               mCameraMuteChanged;

        int32_t            mSettingsOverride; // -1 = use original, otherwise

                                              // the settings override to use.