OSDN Git Service

Fix CameraService error flag when running HAL1 with API2.
authorRuben Brunk <rubenbrunk@google.com>
Mon, 19 Aug 2013 22:21:19 +0000 (15:21 -0700)
committerRuben Brunk <rubenbrunk@google.com>
Wed, 4 Sep 2013 18:57:45 +0000 (11:57 -0700)
Bug: 10620944

Change-Id: I44c0d09a3d313ae8f724fbe61fa5f36cf5b38b6d

services/camera/libcameraservice/CameraService.cpp

index bf9bc71..fe16314 100644 (file)
@@ -492,7 +492,7 @@ status_t CameraService::connectPro(
           case CAMERA_DEVICE_API_VERSION_1_0:
             ALOGE("Camera id %d uses HALv1, doesn't support ProCamera",
                   cameraId);
-            return -ENOTSUP;
+            return -EOPNOTSUPP;
             break;
           case CAMERA_DEVICE_API_VERSION_2_0:
           case CAMERA_DEVICE_API_VERSION_2_1:
@@ -570,7 +570,7 @@ status_t CameraService::connectDevice(
         switch(deviceVersion) {
           case CAMERA_DEVICE_API_VERSION_1_0:
             ALOGW("Camera using old HAL version: %d", deviceVersion);
-            return -ENOTSUP;
+            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: