diff options
| author | Zhijun He <zhijunhe@google.com> | 2013-10-02 09:56:55 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-02 09:56:55 -0700 |
| commit | e78d02aedcc4990365a0fd8d36c6de255cc6b431 (patch) | |
| tree | 5bcae51c77a8cba5b6b6f63388179d241018a64c /services | |
| parent | 911d5ce961e3ec82c0a189a171e60726cd3c5b23 (diff) | |
| parent | 3d839a327a17262ada6dc002544209c9310f0c2b (diff) | |
| download | frameworks_av-e78d02aedcc4990365a0fd8d36c6de255cc6b431.zip frameworks_av-e78d02aedcc4990365a0fd8d36c6de255cc6b431.tar.gz frameworks_av-e78d02aedcc4990365a0fd8d36c6de255cc6b431.tar.bz2 | |
am 3d839a32: am f05e50eb: Camera: only return static metadata for HAL3 device
* commit '3d839a327a17262ada6dc002544209c9310f0c2b':
Camera: only return static metadata for HAL3 device
Diffstat (limited to 'services')
| -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; |