From f05e50eb06d3f70e50fa7f44c1fd32128033b49d Mon Sep 17 00:00:00 2001 From: Zhijun He Date: Tue, 1 Oct 2013 11:05:33 -0700 Subject: Camera: only return static metadata for HAL3 device This effectively disables the camera2 APIs for HAL2.x or lower HAL device. Bug: 10360518 Change-Id: I0f374ac533468c6181f5672c75088b7144b9c53d --- services/camera/libcameraservice/CameraService.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'services/camera/libcameraservice') diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp index 5e84aaf..34a5b15 100644 --- a/services/camera/libcameraservice/CameraService.cpp +++ b/services/camera/libcameraservice/CameraService.cpp @@ -255,6 +255,12 @@ status_t CameraService::getCameraCharacteristics(int cameraId, return BAD_VALUE; } + if (getDeviceVersion(cameraId, &facing) <= CAMERA_DEVICE_API_VERSION_2_1) { + // Disable HAL2.x support for camera2 API for now. + ALOGW("%s: HAL2.x doesn't support getCameraCharacteristics for now", __FUNCTION__); + return BAD_VALUE; + } + struct camera_info info; status_t ret = mModule->get_camera_info(cameraId, &info); *cameraInfo = info.static_camera_characteristics; -- cgit v1.1