diff options
| author | Ruben Brunk <rubenbrunk@google.com> | 2013-08-19 15:21:19 -0700 |
|---|---|---|
| committer | Ruben Brunk <rubenbrunk@google.com> | 2013-09-04 11:57:45 -0700 |
| commit | 17963d16d66526288ed66c91a6744daf3acfd731 (patch) | |
| tree | 8248514bf96576188d868ee91bd57fd11740d134 | |
| parent | df60eff872f276c1a94ab0355b252b73fe61faa9 (diff) | |
| download | frameworks_av-17963d16d66526288ed66c91a6744daf3acfd731.zip frameworks_av-17963d16d66526288ed66c91a6744daf3acfd731.tar.gz frameworks_av-17963d16d66526288ed66c91a6744daf3acfd731.tar.bz2 | |
Fix CameraService error flag when running HAL1 with API2.
Bug: 10620944
Change-Id: I44c0d09a3d313ae8f724fbe61fa5f36cf5b38b6d
| -rw-r--r-- | services/camera/libcameraservice/CameraService.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp index bf9bc71..fe16314 100644 --- a/services/camera/libcameraservice/CameraService.cpp +++ b/services/camera/libcameraservice/CameraService.cpp @@ -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: |