diff options
| author | Igor Murashkin <iam@google.com> | 2014-06-20 18:49:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-20 03:08:23 +0000 |
| commit | 7e4082ff105f5b2d8fe889b04703f9b828304fbd (patch) | |
| tree | 4bb59ec5912c722cfee32246e63c03bcc3c3b5d6 /services | |
| parent | 9b3cd171710991625a94dea645248f708cb957fb (diff) | |
| parent | 3d07d1ad0e60fd2b9a25563a0c24faf7f1fb1afc (diff) | |
| download | frameworks_av-7e4082ff105f5b2d8fe889b04703f9b828304fbd.zip frameworks_av-7e4082ff105f5b2d8fe889b04703f9b828304fbd.tar.gz frameworks_av-7e4082ff105f5b2d8fe889b04703f9b828304fbd.tar.bz2 | |
Merge "camera: Let #connectLegacy calls through with unspecified HAL version"
Diffstat (limited to 'services')
| -rw-r--r-- | services/camera/libcameraservice/CameraService.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp index b8227a7..109b891 100644 --- a/services/camera/libcameraservice/CameraService.cpp +++ b/services/camera/libcameraservice/CameraService.cpp @@ -791,7 +791,14 @@ status_t CameraService::connectLegacy( /*out*/ sp<ICamera>& device) { - if (mModule->common.module_api_version < CAMERA_MODULE_API_VERSION_2_3) { + if (halVersion != CAMERA_HAL_API_VERSION_UNSPECIFIED && + mModule->common.module_api_version < CAMERA_MODULE_API_VERSION_2_3) { + /* + * Either the HAL version is unspecified in which case this just creates + * a camera client selected by the latest device version, or + * it's a particular version in which case the HAL must supported + * the open_legacy call + */ ALOGE("%s: camera HAL module version %x doesn't support connecting to legacy HAL devices!", __FUNCTION__, mModule->common.module_api_version); return INVALID_OPERATION; |