commit 7b33a74bbc514b99c16be7fff9a34e892bc19264
author Igor Murashkin <iam@google.com> Thu Feb 21 13:49:26 2013 -0800
committer Igor Murashkin <iam@google.com> Fri Feb 22 10:50:15 2013 -0800
tree a3c2e719aebc4dc486312970b57c588cba8f5ce9
parent a91537e268f2b35f9f0dfdc0c4f84655c93285ae

ProCamera: Add getInfo for getting static metadata (and a test)

Change-Id: I3b87dfbc621d98bf41f37a892a1012baf85b5166

camera/ProCamera.cpp

diff --git a/camera/ProCamera.cpp b/camera/ProCamera.cpp
index 142c03b..c95c4e0 100644
--- a/camera/ProCamera.cpp
+++ b/camera/ProCamera.cpp
@@ -361,15 +361,28 @@
 }
 
 int ProCamera::getNumberOfCameras() {
-    ALOGE("%s: not implemented yet", __FUNCTION__);
-    return 1;
+    const sp<ICameraService> cs = getCameraService();
+
+    if (!cs.get()) {
+        return DEAD_OBJECT;
+    }
+    return cs->getNumberOfCameras();
 }
 
 camera_metadata* ProCamera::getCameraInfo(int cameraId) {
-    ALOGE("%s: not implemented yet", __FUNCTION__);
-
     ALOGV("%s: cameraId = %d", __FUNCTION__, cameraId);
-    return NULL;
+
+    sp <IProCameraUser> c = mCamera;
+    if (c == 0) return NULL;
+
+    camera_metadata* ptr = NULL;
+    status_t status = c->getCameraInfo(cameraId, &ptr);
+
+    if (status != OK) {
+        ALOGE("%s: Failed to get camera info, error = %d", __FUNCTION__, status);
+    }
+
+    return ptr;
 }
 
 status_t ProCamera::createDefaultRequest(int templateId,