diff options
| author | Ruben Brunk <rubenbrunk@google.com> | 2014-06-10 12:56:42 -0700 |
|---|---|---|
| committer | Ruben Brunk <rubenbrunk@google.com> | 2014-06-10 13:09:27 -0700 |
| commit | 8129e799f2774235c8cce3bf25fd98ef4ca2471b (patch) | |
| tree | f71be3368b771367f607a1260a87556a35536e89 /services | |
| parent | d8754e07e23eecb68068c0c392aeb0428c529e4e (diff) | |
| download | frameworks_av-8129e799f2774235c8cce3bf25fd98ef4ca2471b.zip frameworks_av-8129e799f2774235c8cce3bf25fd98ef4ca2471b.tar.gz frameworks_av-8129e799f2774235c8cce3bf25fd98ef4ca2471b.tar.bz2 | |
DO NOT MERGE: camera2: Disallow connectDevice for all old HALs.
(preview only)
Bug: 15515564
Change-Id: I14ab73b130ee5355d9cc8b3602738022a5a18710
Diffstat (limited to 'services')
| -rw-r--r-- | services/camera/libcameraservice/CameraService.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp index 9fd35e1..638b871 100644 --- a/services/camera/libcameraservice/CameraService.cpp +++ b/services/camera/libcameraservice/CameraService.cpp @@ -852,13 +852,12 @@ status_t CameraService::connectDevice( switch(deviceVersion) { case CAMERA_DEVICE_API_VERSION_1_0: - ALOGW("Camera using old HAL version: %d", deviceVersion); - return -EOPNOTSUPP; - // TODO: don't allow 2.0 Only allow 2.1 and higher case CAMERA_DEVICE_API_VERSION_2_0: case CAMERA_DEVICE_API_VERSION_2_1: case CAMERA_DEVICE_API_VERSION_3_0: case CAMERA_DEVICE_API_VERSION_3_1: + ALOGW("Camera using old HAL version: %d", deviceVersion); + return -EOPNOTSUPP; case CAMERA_DEVICE_API_VERSION_3_2: client = new CameraDeviceClient(this, cameraCb, String16(), cameraId, facing, callingPid, USE_CALLING_UID, getpid()); |