From 7b33a74bbc514b99c16be7fff9a34e892bc19264 Mon Sep 17 00:00:00 2001
From: Igor Murashkin <iam@google.com>
Date: Thu, 21 Feb 2013 13:49:26 -0800
Subject: ProCamera: Add getInfo for getting static metadata (and a test)

Change-Id: I3b87dfbc621d98bf41f37a892a1012baf85b5166
---
 include/camera/IProCameraUser.h | 5 +++++
 include/camera/ProCamera.h      | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'include/camera')

diff --git a/include/camera/IProCameraUser.h b/include/camera/IProCameraUser.h
index a141769..7bddb0c 100644
--- a/include/camera/IProCameraUser.h
+++ b/include/camera/IProCameraUser.h
@@ -75,6 +75,11 @@ public:
                                                  camera_metadata** request)
                                                                            = 0;
 
+    // Get static camera metadata
+    virtual status_t        getCameraInfo(int cameraId,
+                                          /*out*/
+                                          camera_metadata** info) = 0;
+
 };
 
 // ----------------------------------------------------------------------------
diff --git a/include/camera/ProCamera.h b/include/camera/ProCamera.h
index 7cd9138..11904f9 100644
--- a/include/camera/ProCamera.h
+++ b/include/camera/ProCamera.h
@@ -172,7 +172,7 @@ public:
     static int getNumberOfCameras();
 
     // Get static camera metadata
-    static camera_metadata* getCameraInfo(int cameraId);
+    camera_metadata* getCameraInfo(int cameraId);
 
     sp<IProCameraUser>         remote();
 
-- 
cgit v1.1