commit e25cc656392d8866e163f78b60c7791455d0fb44
author Chih-Chung Chang <chihchung@google.com> Thu May 06 16:36:58 2010 +0800
committer Chih-Chung Chang <chihchung@google.com> Mon May 10 11:21:14 2010 +0800
tree d264b1c05e9edb2851c5ddc21a662617ea1d4ebc
parent a0a126a060b6b9ba51bc99f82ff4d322f779325e

Support multiple cameras in framework.

Change-Id: I081f0fbdca4b633715ea7c3b3d42f8662d27598a

libs/camera/Camera.cpp

diff --git a/libs/camera/Camera.cpp b/libs/camera/Camera.cpp
index f19c502..3346b1f 100644
--- a/libs/camera/Camera.cpp
+++ b/libs/camera/Camera.cpp
@@ -95,13 +95,20 @@
     disconnect();
 }
 
-sp<Camera> Camera::connect()
+int32_t Camera::getNumberOfCameras()
+{
+    const sp<ICameraService>& cs = getCameraService();
+    if (cs == 0) return 0;
+    return cs->getNumberOfCameras();
+}
+
+sp<Camera> Camera::connect(int cameraId)
 {
     LOGV("connect");
     sp<Camera> c = new Camera();
     const sp<ICameraService>& cs = getCameraService();
     if (cs != 0) {
-        c->mCamera = cs->connect(c);
+        c->mCamera = cs->connect(c, cameraId);
     }
     if (c->mCamera != 0) {
         c->mCamera->asBinder()->linkToDeath(c);