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

Commit 03db5b54 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Camera: Ensure 'isSlowJpegModeForced' is always initialized" into... 

Merge "Camera: Ensure 'isSlowJpegModeForced' is always initialized" into udc-dev am: 7112b40a am: 3d0cf177

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



Change-Id: I60e45bc13aec5218401c2ff0e32b5445d1446364
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4d9326ac 3d0cf177

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) {

}