summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorcodeworkx <codeworkx@cyanogenmod.org>2013-01-17 19:51:39 +0000
committercodeworkx <codeworkx@cyanogenmod.org>2013-01-17 19:51:39 +0000
commit8001424a87f9b7e2dd2482b9ff257b9bff3a4d8b (patch)
tree4260fccb0fc3fede82d6ac4761ff99192ec1753b /include
parent21f546d8b0259380048b14d42b38243b5ddc9fe4 (diff)
downloadframeworks_av-8001424a87f9b7e2dd2482b9ff257b9bff3a4d8b.zip
frameworks_av-8001424a87f9b7e2dd2482b9ff257b9bff3a4d8b.tar.gz
frameworks_av-8001424a87f9b7e2dd2482b9ff257b9bff3a4d8b.tar.bz2
camera: add cityid parameter and getInt64 stub for t0lte camera hal
Change-Id: I28a1a909aa8267ba77c2b44d4191f7a92e8ef533
Diffstat (limited to 'include')
-rw-r--r--include/camera/CameraParameters.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/camera/CameraParameters.h b/include/camera/CameraParameters.h
index e82d8e7..21e907e 100644
--- a/include/camera/CameraParameters.h
+++ b/include/camera/CameraParameters.h
@@ -66,6 +66,9 @@ public:
void setFloat(const char *key, float value);
const char *get(const char *key) const;
int getInt(const char *key) const;
+#ifdef SAMSUNG_CAMERA_HARDWARE
+ int getInt64(const char *key) const;
+#endif
float getFloat(const char *key) const;
void remove(const char *key);
@@ -631,6 +634,7 @@ public:
static const char KEY_METERING[];
static const char KEY_WDR[];
static const char KEY_WEATHER[];
+ static const char KEY_CITYID[];
#endif
static const char KEY_AE_BRACKET_HDR[];