From 716687046f38bf20cad104a99a8254f31cf52386 Mon Sep 17 00:00:00 2001 From: Ravneet Dhanjal Date: Fri, 6 May 2022 18:57:22 +0000 Subject: [PATCH] Revert "CameraManager: Add path to update vendorTag info upon HA..." Revert submission 18129735-b181579423 Reason for revert: Causing HWAddressSanitizer bug Reverted Changes: I8d8c00159:CameraManager: Add path to update vendorTag info u... I01212f4c6:CameraService: Add path to update vendorTag info u... Bug: 231526212 Change-Id: I0d2da06c531081ba7243b565d8318a6afff45a2b --- core/java/android/hardware/camera2/CameraManager.java | 8 -------- core/jni/android_hardware_camera2_CameraMetadata.cpp | 9 +-------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/core/java/android/hardware/camera2/CameraManager.java b/core/java/android/hardware/camera2/CameraManager.java index c0c403ac3821c..d6d3a97687b5c 100644 --- a/core/java/android/hardware/camera2/CameraManager.java +++ b/core/java/android/hardware/camera2/CameraManager.java @@ -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); diff --git a/core/jni/android_hardware_camera2_CameraMetadata.cpp b/core/jni/android_hardware_camera2_CameraMetadata.cpp index d89ae4fa2fb1e..5293c583cfd0e 100644 --- a/core/jni/android_hardware_camera2_CameraMetadata.cpp +++ b/core/jni/android_hardware_camera2_CameraMetadata.cpp @@ -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 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