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

Commit d681b0df authored by Eino-Ville Talvala's avatar Eino-Ville Talvala Committed by Automerger Merge Worker
Browse files

Camera: Fix deadlock when querying for camera muting support am: 1646c3ce 

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

Change-Id: I07d4a97cde41bfc8e1da546acff5c5e51f4fb214
parents 4af0bd7c 1646c3ce

services/camera/libcameraservice/device3/Camera3Device.cpp

+22 −24
Original line number Diff line number Diff line
@@ -306,9 +306,25 @@ status_t Camera3Device::initializeCommonLocked() { 
        sessionParamKeys.insertArrayAt(sessionKeysEntry.data.i32, 0, sessionKeysEntry.count);

    }



    camera_metadata_entry_t availableTestPatternModes = mDeviceInfo.find(

            ANDROID_SENSOR_AVAILABLE_TEST_PATTERN_MODES);

    for (size_t i = 0; i < availableTestPatternModes.count; i++) {

        if (availableTestPatternModes.data.i32[i] ==

                ANDROID_SENSOR_TEST_PATTERN_MODE_SOLID_COLOR) {

            mSupportCameraMute = true;

            mSupportTestPatternSolidColor = true;

            break;

        } else if (availableTestPatternModes.data.i32[i] ==

                ANDROID_SENSOR_TEST_PATTERN_MODE_BLACK) {

            mSupportCameraMute = true;

            mSupportTestPatternSolidColor = false;

        }

    }



    /** Start up request queue thread */

    mRequestThread = new RequestThread(

            this, mStatusTracker, mInterface, sessionParamKeys, mUseHalBufManager);

            this, mStatusTracker, mInterface, sessionParamKeys,

            mUseHalBufManager, mSupportCameraMute);

    res = mRequestThread->run(String8::format("C3Dev-%s-ReqQueue", mId.string()).string());

    if (res != OK) {

        SET_ERR_L("Unable to start request queue thread: %s (%d)",
@@ -364,21 +380,6 @@ status_t Camera3Device::initializeCommonLocked() { 
        mRotateAndCropMappers.emplace(mId.c_str(), &mDeviceInfo);

    }



    camera_metadata_entry_t availableTestPatternModes = mDeviceInfo.find(

            ANDROID_SENSOR_AVAILABLE_TEST_PATTERN_MODES);

    for (size_t i = 0; i < availableTestPatternModes.count; i++) {

        if (availableTestPatternModes.data.i32[i] ==

                ANDROID_SENSOR_TEST_PATTERN_MODE_SOLID_COLOR) {

            mSupportCameraMute = true;

            mSupportTestPatternSolidColor = true;

            break;

        } else if (availableTestPatternModes.data.i32[i] ==

                ANDROID_SENSOR_TEST_PATTERN_MODE_BLACK) {

            mSupportCameraMute = true;

            mSupportTestPatternSolidColor = false;

        }

    }



    mInjectionMethods = new Camera3DeviceInjectionMethods(this);



    return OK;
@@ -4155,7 +4156,8 @@ void Camera3Device::HalInterface::onStreamReConfigured(int streamId) { 
Camera3Device::RequestThread::RequestThread(wp<Camera3Device> parent,

        sp<StatusTracker> statusTracker,

        sp<HalInterface> interface, const Vector<int32_t>& sessionParamKeys,

        bool useHalBufManager) :

        bool useHalBufManager,

        bool supportCameraMute) :

        Thread(/*canCallJava*/false),

        mParent(parent),

        mStatusTracker(statusTracker),
@@ -4181,7 +4183,8 @@ Camera3Device::RequestThread::RequestThread(wp<Camera3Device> parent, 
        mRequestLatency(kRequestLatencyBinSize),

        mSessionParamKeys(sessionParamKeys),

        mLatestSessionParams(sessionParamKeys.size()),

        mUseHalBufManager(useHalBufManager) {

        mUseHalBufManager(useHalBufManager),

        mSupportCameraMute(supportCameraMute){

    mStatusId = statusTracker->addComponent("RequestThread");

}
@@ -5862,12 +5865,7 @@ bool Camera3Device::RequestThread::overrideTestPattern( 
        const sp<CaptureRequest> &request) {

    ATRACE_CALL();



    {

        sp<Camera3Device> parent = mParent.promote();

        if (parent != nullptr) {

            if (!parent->supportsCameraMute()) return false;

        }

    }

    if (!mSupportCameraMute) return false;



    Mutex::Autolock l(mTriggerMutex);

services/camera/libcameraservice/device3/Camera3Device.h

+3 −1
Original line number Diff line number Diff line
@@ -813,7 +813,8 @@ class Camera3Device : 
                sp<camera3::StatusTracker> statusTracker,

                sp<HalInterface> interface,

                const Vector<int32_t>& sessionParamKeys,

                bool useHalBufManager);

                bool useHalBufManager,

                bool supportCameraMute);

        ~RequestThread();



        void     setNotificationListener(wp<NotificationListener> listener);
@@ -1086,6 +1087,7 @@ class Camera3Device : 
        std::map<int32_t, std::set<String8>> mGroupIdPhysicalCameraMap;



        const bool         mUseHalBufManager;

        const bool         mSupportCameraMute;

    };

    sp<RequestThread> mRequestThread;