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

Commit 4de246e7 authored by Eino-Ville Talvala's avatar Eino-Ville Talvala Committed by Android (Google) Code Review
Browse files

Merge "Camera: Fix error handling for reading in vendor tags" into nyc-dev

parents 71208d6f 5f2f804a

core/jni/android_hardware_camera2_CameraMetadata.cpp

+5 −6
Original line number Diff line number Diff line
@@ -918,15 +918,14 @@ static jint CameraMetadata_setupGlobalVendorTagDescriptor(JNIEnv *env, jobject t 
    sp<VendorTagDescriptor> desc = new VendorTagDescriptor();

    binder::Status res = cameraService->getCameraVendorTagDescriptor(/*out*/desc.get());



    if (res.serviceSpecificErrorCode() == hardware::ICameraService::ERROR_DEPRECATED_HAL) {

        ALOGW("%s: Camera HAL too old; does not support vendor tags", __FUNCTION__);

    if (res.serviceSpecificErrorCode() == hardware::ICameraService::ERROR_DISCONNECTED) {

        // No camera module available, not an error on devices with no cameras

        VendorTagDescriptor::clearGlobalVendorTagDescriptor();



        return OK;

    } else if (!res.isOk()) {

        ALOGE("%s: Failed to setup vendor tag descriptors: %s: %s",

                __FUNCTION__, res.serviceSpecificErrorCode(),

                res.toString8().string());

        VendorTagDescriptor::clearGlobalVendorTagDescriptor();

        ALOGE("%s: Failed to setup vendor tag descriptors: %s",

                __FUNCTION__, res.toString8().string());

        return res.serviceSpecificErrorCode();

    }