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

Commit 04a57357 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 10360508 from 7112b40a to udc-release 

Change-Id: Ifbc9a6714cbb77e608f51df9949ff2cad8664e8a
parents 5f3b6aa6 7112b40a

services/camera/libcameraservice/api1/Camera2Client.cpp

+1 −3
Original line number Diff line number Diff line
@@ -80,9 +80,7 @@ Camera2Client::Camera2Client(const sp<CameraService>& cameraService, 


    SharedParameters::Lock l(mParameters);

    l.mParameters.state = Parameters::DISCONNECTED;

    if (forceSlowJpegMode) {

        l.mParameters.isSlowJpegModeForced = true;

    }

    l.mParameters.isSlowJpegModeForced = forceSlowJpegMode;

}



status_t Camera2Client::initialize(sp<CameraProviderManager> manager, const String8& monitorTags) {

services/camera/libcameraservice/api1/client2/Parameters.cpp

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ Parameters::Parameters(int cameraId, 
        int cameraFacing) :

        cameraId(cameraId),

        cameraFacing(cameraFacing),

        isSlowJpegModeForced(false),

        info(NULL),

        mDefaultSceneMode(ANDROID_CONTROL_SCENE_MODE_DISABLED) {

}

services/camera/libcameraservice/utils/SessionConfigurationUtils.cpp

+2 −2
Original line number Diff line number Diff line
@@ -73,11 +73,11 @@ void StreamConfiguration::getStreamConfigurations( 


    int32_t dynamicDepthKey =

            SessionConfigurationUtils::getAppropriateModeTag(

                    ANDROID_DEPTH_AVAILABLE_DYNAMIC_DEPTH_STREAM_CONFIGURATIONS);

                    ANDROID_DEPTH_AVAILABLE_DYNAMIC_DEPTH_STREAM_CONFIGURATIONS, maxRes);



    int32_t heicKey =

            SessionConfigurationUtils::getAppropriateModeTag(

                    ANDROID_HEIC_AVAILABLE_HEIC_STREAM_CONFIGURATIONS);

                    ANDROID_HEIC_AVAILABLE_HEIC_STREAM_CONFIGURATIONS, maxRes);



    getStreamConfigurations(staticInfo, scalerKey, scm);

    getStreamConfigurations(staticInfo, depthKey, scm);