diff options
| author | Ruben Brunk <rubenbrunk@google.com> | 2013-09-04 21:48:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-04 21:48:14 +0000 |
| commit | 7a4c2711d7a85ce962b9d18fee41975f9c574c0b (patch) | |
| tree | f3dc18135a26e3ae73fb6de6924ea54fc4bb682e | |
| parent | c85d61964cb6f9b23cd2e82e43d7052b3e7d4fbc (diff) | |
| parent | 17963d16d66526288ed66c91a6744daf3acfd731 (diff) | |
| download | frameworks_av-7a4c2711d7a85ce962b9d18fee41975f9c574c0b.zip frameworks_av-7a4c2711d7a85ce962b9d18fee41975f9c574c0b.tar.gz frameworks_av-7a4c2711d7a85ce962b9d18fee41975f9c574c0b.tar.bz2 | |
Merge "Fix CameraService error flag when running HAL1 with API2." into klp-dev
| -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: |