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

Commit 71157604 authored by Jayant Chowdhary's avatar Jayant Chowdhary Committed by Automerger Merge Worker
Browse files

Merge "Fix deadlock when notifyPhysicalCameraDevice is called while... 

Merge "Fix deadlock when notifyPhysicalCameraDevice is called while waitUntilDrained hasn't completed" into udc-qpr-dev am: 2894ae2e am: 3db88010

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



Change-Id: I5d24a857e3103f8b90c76abe445fdff5dad10ebd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 37b20d94 3db88010

services/camera/libcameraservice/CameraService.h

+1 −1
Original line number Diff line number Diff line
@@ -367,7 +367,7 @@ public: 
        static bool isValidAudioRestriction(int32_t mode);



        // Override rotate-and-crop AUTO behavior

        virtual status_t setRotateAndCropOverride(uint8_t rotateAndCrop) = 0;

        virtual status_t setRotateAndCropOverride(uint8_t rotateAndCrop, bool fromHal = false) = 0;



        // Override autoframing AUTO behaviour

        virtual status_t setAutoframingOverride(uint8_t autoframingValue) = 0;

services/camera/libcameraservice/api1/Camera2Client.cpp

+2 −2
Original line number Diff line number Diff line
@@ -2342,7 +2342,7 @@ status_t Camera2Client::setCameraServiceWatchdog(bool enabled) { 
    return mDevice->setCameraServiceWatchdog(enabled);

}



status_t Camera2Client::setRotateAndCropOverride(uint8_t rotateAndCrop) {

status_t Camera2Client::setRotateAndCropOverride(uint8_t rotateAndCrop, bool fromHal) {

    if (rotateAndCrop > ANDROID_SCALER_ROTATE_AND_CROP_AUTO) return BAD_VALUE;



    {
@@ -2356,7 +2356,7 @@ status_t Camera2Client::setRotateAndCropOverride(uint8_t rotateAndCrop) { 
    }



    return mDevice->setRotateAndCropAutoBehavior(

        static_cast<camera_metadata_enum_android_scaler_rotate_and_crop_t>(rotateAndCrop));

        static_cast<camera_metadata_enum_android_scaler_rotate_and_crop_t>(rotateAndCrop), fromHal);

}



status_t Camera2Client::setAutoframingOverride(uint8_t autoframingValue) {

services/camera/libcameraservice/api1/Camera2Client.h

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ public: 
    virtual status_t        setVideoTarget(const sp<IGraphicBufferProducer>& bufferProducer);

    virtual status_t        setAudioRestriction(int mode);

    virtual int32_t         getGlobalAudioRestriction();

    virtual status_t        setRotateAndCropOverride(uint8_t rotateAndCrop);

    virtual status_t        setRotateAndCropOverride(uint8_t rotateAndCrop, bool fromHal = false);

    virtual status_t        setAutoframingOverride(uint8_t autoframingMode);



    virtual bool            supportsCameraMute();

services/camera/libcameraservice/api2/CameraDeviceClient.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1762,11 +1762,11 @@ status_t CameraDeviceClient::setCameraServiceWatchdog(bool enabled) { 
    return mDevice->setCameraServiceWatchdog(enabled);

}



status_t CameraDeviceClient::setRotateAndCropOverride(uint8_t rotateAndCrop) {

status_t CameraDeviceClient::setRotateAndCropOverride(uint8_t rotateAndCrop, bool fromHal) {

    if (rotateAndCrop > ANDROID_SCALER_ROTATE_AND_CROP_AUTO) return BAD_VALUE;



    return mDevice->setRotateAndCropAutoBehavior(

        static_cast<camera_metadata_enum_android_scaler_rotate_and_crop_t>(rotateAndCrop));

        static_cast<camera_metadata_enum_android_scaler_rotate_and_crop_t>(rotateAndCrop), fromHal);

}



status_t CameraDeviceClient::setAutoframingOverride(uint8_t autoframingValue) {

services/camera/libcameraservice/api2/CameraDeviceClient.h

+2 −1
Original line number Diff line number Diff line
@@ -198,7 +198,8 @@ public: 
    virtual status_t      initialize(sp<CameraProviderManager> manager,

            const std::string& monitorTags) override;



    virtual status_t      setRotateAndCropOverride(uint8_t rotateAndCrop) override;

    virtual status_t      setRotateAndCropOverride(uint8_t rotateAndCrop,

            bool fromHal = false) override;



    virtual status_t      setAutoframingOverride(uint8_t autoframingValue) override;