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

Commit 5956174b authored by Ravneet Dhanjal's avatar Ravneet Dhanjal Committed by Android (Google) Code Review
Browse files

Merge "Revert "CameraManager: Add path to update vendorTag info upon HA...""

parents 29a03b25 71668704

core/java/android/hardware/camera2/CameraManager.java

+0 −8
Original line number Diff line number Diff line
@@ -2200,14 +2200,6 @@ public final class CameraManager { 
                return;

            }



            // Setup vendor tag on status change in case it was not set correctly

            // during connect due to issues in HAL

            try {

                CameraMetadataNative.setupGlobalVendorTagDescriptor();

            } catch (ServiceSpecificException e) {

                handleRecoverableSetupErrors(e);

            }



            Integer oldStatus;

            if (status == ICameraServiceListener.STATUS_NOT_PRESENT) {

                oldStatus = mDeviceStatus.remove(id);

core/jni/android_hardware_camera2_CameraMetadata.cpp

+1 −8
Original line number Diff line number Diff line
@@ -947,15 +947,8 @@ static jint CameraMetadata_setupGlobalVendorTagDescriptor(JNIEnv *env, jclass th 
        return hardware::ICameraService::ERROR_DISCONNECTED;

    }



    binder::Status res = cameraService->setUpVendorTags();

    if (!res.isOk()) {

        ALOGE("%s: Failed to setup vendor tags for camera providers: %s", __FUNCTION__,

              res.toString8().string());

        return res.serviceSpecificErrorCode();

    }



    sp<VendorTagDescriptor> desc = new VendorTagDescriptor();

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

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



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

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