Merge "camera2: Don't log vendor tag errors when camera HAL too old"

This commit is contained in:
Igor Murashkin
2014-03-17 21:53:47 +00:00
committed by Android (Google) Code Review
2 changed files with 10 additions and 10 deletions

View File

@@ -81,13 +81,8 @@ public final class CameraManager {
mCameraService = CameraBinderDecorator.newInstance(cameraServiceRaw);
try {
int err = CameraMetadataNative.nativeSetupGlobalVendorTagDescriptor();
if (err == CameraBinderDecorator.EOPNOTSUPP) {
Log.w(TAG, "HAL version doesn't vendor tags.");
} else {
CameraBinderDecorator.throwOnError(CameraMetadataNative.
nativeSetupGlobalVendorTagDescriptor());
}
CameraBinderDecorator.throwOnError(
CameraMetadataNative.nativeSetupGlobalVendorTagDescriptor());
} catch(CameraRuntimeException e) {
throw new IllegalStateException("Failed to setup camera vendor tags",
e.asChecked());