commit 42092d7015b078a09c36de107d924fc8139ccf50
author Ruben Brunk <rubenbrunk@google.com> Wed Jun 11 00:09:41 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 10 22:18:15 2014 +0000
tree 284be1a21638076bc869e68143bccac3a442dea6
parent 3416f9ac471f97e9544ee821a97a101cbdd25b11
parent 8129e799f2774235c8cce3bf25fd98ef4ca2471b

Merge "DO NOT MERGE: camera2: Disallow connectDevice for all old HALs." into lmp-preview-dev

services/camera/libcameraservice/CameraService.cpp

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 @@
 
         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());