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

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

Snap for 9552684 from ab02c1a0 to tm-qpr3-release 

Change-Id: Ib218bbd9c8dc3176e7df25cf365d8ef4e922c6df
parents 1add31a7 ab02c1a0

camera/ndk/impl/ACameraManager.cpp

+2 −2
Original line number Diff line number Diff line
@@ -696,7 +696,7 @@ camera_status_t ACameraManager::getCameraCharacteristics( 
    CameraMetadata rawMetadata;

    int targetSdkVersion = android_get_application_target_sdk_version();

    binder::Status serviceRet = cs->getCameraCharacteristics(String16(cameraIdStr),

            targetSdkVersion, /*overrideToPortrait*/true, &rawMetadata);

            targetSdkVersion, /*overrideToPortrait*/false, &rawMetadata);

    if (!serviceRet.isOk()) {

        switch(serviceRet.serviceSpecificErrorCode()) {

            case hardware::ICameraService::ERROR_DISCONNECTED:
@@ -748,7 +748,7 @@ ACameraManager::openCamera( 
    binder::Status serviceRet = cs->connectDevice(

            callbacks, String16(cameraId), String16(""), {},

            hardware::ICameraService::USE_CALLING_UID, /*oomScoreOffset*/0,

            targetSdkVersion, /*overrideToPortrait*/true, /*out*/&deviceRemote);

            targetSdkVersion, /*overrideToPortrait*/false, /*out*/&deviceRemote);



    if (!serviceRet.isOk()) {

        ALOGE("%s: connect camera device failed: %s", __FUNCTION__, serviceRet.toString8().string());