Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17963d16 authored by Ruben Brunk's avatar Ruben Brunk
Browse files

Fix CameraService error flag when running HAL1 with API2. 

Bug: 10620944

Change-Id: I44c0d09a3d313ae8f724fbe61fa5f36cf5b38b6d
parent df60eff8

services/camera/libcameraservice/CameraService.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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: