diff options
| author | Zhijun He <zhijunhe@google.com> | 2013-10-01 11:05:33 -0700 |
|---|---|---|
| committer | Zhijun He <zhijunhe@google.com> | 2013-10-01 11:14:06 -0700 |
| commit | f05e50eb06d3f70e50fa7f44c1fd32128033b49d (patch) | |
| tree | 32263232ea4d6d250f6f14011461f8f1c6914b60 /services/camera/libcameraservice | |
| parent | 26c1fb23a1e2cc059aac42fd1814efba2a3e9640 (diff) | |
| download | frameworks_av-f05e50eb06d3f70e50fa7f44c1fd32128033b49d.zip frameworks_av-f05e50eb06d3f70e50fa7f44c1fd32128033b49d.tar.gz frameworks_av-f05e50eb06d3f70e50fa7f44c1fd32128033b49d.tar.bz2 | |
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
Diffstat (limited to 'services/camera/libcameraservice')
| -rw-r--r-- | services/camera/libcameraservice/CameraService.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
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; |