commit 69e22433b9d7df77907579f67e47a159aa57f876
author Igor Murashkin <iam@google.com> Wed Feb 20 18:24:43 2013 -0800
committer Igor Murashkin <iam@google.com> Fri Feb 22 10:50:14 2013 -0800
tree eb271a5175ff8bac5e86ccd72637481738efddf9
parent 9476926bb91bf15f7aff2a289a4805148f5a8a4e

Camera: ProCamera2Client - add createStream (service is stubbed) and unit test

Change-Id: I1ae7ba9b24f5883c214c19a7ed0eaf0c802d69c1

services/camera/libcameraservice/CameraService.cpp

diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
index 4941965..eb8bc05 100644
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp
@@ -39,6 +39,7 @@
 #include "CameraService.h"
 #include "CameraClient.h"
 #include "Camera2Client.h"
+#include "ProCamera2Client.h"
 
 namespace android {
 
@@ -281,7 +282,8 @@
         return NULL;
         break;
       case CAMERA_DEVICE_API_VERSION_2_0:
-        client = new ProClient(this, cameraCb, cameraId,
+      case CAMERA_DEVICE_API_VERSION_2_1:
+        client = new ProCamera2Client(this, cameraCb, cameraId,
                 facing, callingPid, getpid());
         break;
       case -1: