summaryrefslogtreecommitdiffstats
path: root/camera
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 /camera
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 'camera')
-rw-r--r--camera/CameraParameters.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/camera/CameraParameters.cpp b/camera/CameraParameters.cpp
index 0931c2c..f41be22 100644
--- a/camera/CameraParameters.cpp
+++ b/camera/CameraParameters.cpp
@@ -154,6 +154,7 @@ const char CameraParameters::KEY_ANTI_SHAKE_MODE[] = "anti-shake";
const char CameraParameters::KEY_METERING[] = "metering";
const char CameraParameters::KEY_WDR[] = "wdr";
const char CameraParameters::KEY_WEATHER[] = "weather";
+const char CameraParameters::KEY_CITYID[] = "contextualtag-cityid";
#endif
const char CameraParameters::TRUE[] = "true";
@@ -485,6 +486,13 @@ int CameraParameters::getInt(const char *key) const
return strtol(v, 0, 0);
}
+#ifdef SAMSUNG_CAMERA_HARDWARE
+int CameraParameters::getInt64(const char *key) const
+{
+ return -1;
+}
+#endif
+
float CameraParameters::getFloat(const char *key) const
{
const char *v = get(key);