Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ravneet Dhanjal
2022-05-06 21:23:01 +00:00
committed by Android (Google) Code Review
parent 29a03b252f 716687046f
commit 5956174bf2
2 changed files with 1 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/hardware/camera2/CameraManager.java
View File

@@ -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);

9
core/jni/android_hardware_camera2_CameraMetadata.cpp
View File

@@ -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