commit ff458b7e24a8e23f42d9d21687e3c1f946b01a87
author Zhijun He <zhijunhe@google.com> Tue Apr 07 20:17:01 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 07 20:17:02 2015 +0000
tree ec9f4cf20fe5eb1b64d452fd369b6d27547b7a5e
parent e58e2a168e4a8bbd55e31bf12bd03ffc437c8226
parent f2d1e4dfc14fd90e1256b3f6e96e69560f5d3b5e

Merge "Camera2Client: support HAL version 3.3"

services/camera/libcameraservice/api1/Camera2Client.cpp

diff --git a/services/camera/libcameraservice/api1/Camera2Client.cpp b/services/camera/libcameraservice/api1/Camera2Client.cpp
index 6f44aee..f53f425 100644
--- a/services/camera/libcameraservice/api1/Camera2Client.cpp
+++ b/services/camera/libcameraservice/api1/Camera2Client.cpp
@@ -121,7 +121,8 @@
         }
         case CAMERA_DEVICE_API_VERSION_3_0:
         case CAMERA_DEVICE_API_VERSION_3_1:
-        case CAMERA_DEVICE_API_VERSION_3_2: {
+        case CAMERA_DEVICE_API_VERSION_3_2:
+        case CAMERA_DEVICE_API_VERSION_3_3: {
             sp<ZslProcessor3> zslProc =
                     new ZslProcessor3(this, mCaptureSequencer);
             mZslProcessor = zslProc;