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

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

Browse Source
This commit is contained in:
Eino-Ville Talvala
2016-03-03 20:21:00 +00:00
committed by Android (Google) Code Review
parent 71208d6f7b 5f2f804a19
commit 4de246e775
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/jni/android_hardware_camera2_CameraMetadata.cpp
View File

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