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

Commit 0c84b7e0 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 10844344 from 2894ae2e to udc-qpr1-release 

Change-Id: I026ac3df483a759f5b99d48ceb77f11230711248
parents 013e60d2 2894ae2e

services/camera/libcameraservice/CameraService.h

+1 −1
Original line number Diff line number Diff line
@@ -362,7 +362,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
@@ -2350,7 +2350,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;



    {
@@ -2364,7 +2364,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
@@ -1761,11 +1761,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 String8& 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;