commit b0be1039c136f85778dffaf761af3d09907e21aa
author Alex Ray <aray@google.com> Tue May 28 15:52:47 2013 -0700
committer Alex Ray <aray@google.com> Fri Jun 28 13:52:50 2013 -0700
tree 1c67e347c2bfcb7cf056dad64953821982bc89f9
parent 6a96df3b335f8fc1b514fdcf95e8ded350fcf2b5

modules: camera: add get_camera_info support

Basic static metadata statically constructed from preprocessor passes
over an array of camera metadata tags.

Change-Id: I16ea9f4d68120d5a0bc010a4a67b0cbcd761329e

modules/camera/CameraHAL.cpp

diff --git a/modules/camera/CameraHAL.cpp b/modules/camera/CameraHAL.cpp
index 05b1fad..0d8164c 100644
--- a/modules/camera/CameraHAL.cpp
+++ b/modules/camera/CameraHAL.cpp
@@ -76,7 +76,7 @@
         return -ENODEV;
     }
     // TODO: return device-specific static metadata
-    return 0;
+    return mCameras[id]->getInfo(info);
 }
 
 int CameraHAL::setCallbacks(const camera_module_callbacks_t *callbacks)
@@ -93,7 +93,7 @@
 
     ALOGV("%s: module=%p, name=%s, device=%p", __func__, mod, name, dev);
     id = strtol(name, &nameEnd, 10);
-    if (nameEnd != NULL) {
+    if (*nameEnd != '\0') {
         ALOGE("%s: Invalid camera id name %s", __func__, name);
         return -EINVAL;
     } else if (id < 0 || id >= mNumberOfCameras) {