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

Commit 1ac5a450 authored by Zhijun He's avatar Zhijun He Committed by android-build-merger
Browse files

Merge "Camera: update service to support HAL3.4" into nyc-dev 

am: f15d88da

* commit 'f15d88da':
  Camera: update service to support HAL3.4

Change-Id: I2e29f46977befaf13478d3132bb2a68bb39ea003
parents 236e8ffc f15d88da

services/camera/libcameraservice/CameraService.cpp

+3 −0
Original line number Diff line number Diff line
@@ -775,6 +775,7 @@ Status CameraService::makeClient(const sp<CameraService>& cameraService, 
          case CAMERA_DEVICE_API_VERSION_3_1:

          case CAMERA_DEVICE_API_VERSION_3_2:

          case CAMERA_DEVICE_API_VERSION_3_3:

          case CAMERA_DEVICE_API_VERSION_3_4:

            if (effectiveApiLevel == API_1) { // Camera1 API route

                sp<ICameraClient> tmp = static_cast<ICameraClient*>(cameraCb.get());

                *client = new Camera2Client(cameraService, tmp, packageName, cameraId, facing,
@@ -1636,6 +1637,7 @@ Status CameraService::supportsCameraApi(int cameraId, int apiVersion, bool *isSu 
            break;

        case CAMERA_DEVICE_API_VERSION_3_2:

        case CAMERA_DEVICE_API_VERSION_3_3:

        case CAMERA_DEVICE_API_VERSION_3_4:

            ALOGV("%s: Camera id %d uses HAL3.2 or newer, supports api1/api2 directly",

                    __FUNCTION__, cameraId);

            *isSupported = true;
@@ -1733,6 +1735,7 @@ int CameraService::checkCameraCapabilities(int id, camera_info info, int *latest 
            case CAMERA_DEVICE_API_VERSION_3_1:

            case CAMERA_DEVICE_API_VERSION_3_2:

            case CAMERA_DEVICE_API_VERSION_3_3:

            case CAMERA_DEVICE_API_VERSION_3_4:

                // in support

                break;

            case CAMERA_DEVICE_API_VERSION_2_0: