commit 76fa63ccefbac3ca3e722bc9ba016101858c3cdd
author Zhijun He <zhijunhe@google.com> Wed May 04 23:08:07 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed May 04 23:08:07 2016 +0000
tree 3fd5d42e0824e62261de06d352475e41322b7544
parent 08686471b02b70d47524bdea85b9b182b42bea88
parent f15d88daa721d53921bfb7798dd12f7c74b44ac1

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

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

Change-Id: I4623a113155d59bd4195ab19f6273fd219e0a82d

services/camera/libcameraservice/CameraService.cpp

diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
index 13691e7..ff73c28 100644
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp
@@ -773,6 +773,7 @@
           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,
@@ -1618,6 +1619,7 @@
             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;
@@ -1715,6 +1717,7 @@
             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: