summaryrefslogtreecommitdiffstats
path: root/libs/camera
diff options
context:
space:
mode:
authorWu-cheng Li <wuchengli@google.com>2010-05-12 07:55:00 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-05-12 07:55:00 -0700
commitb3390135890800b9c5f0ab58ae3af80ab200dd8e (patch)
tree8b150157548ef4b694037810a881142b8e1c85f9 /libs/camera
parent2cd841d485968181eb362338b9e66067767bd2eb (diff)
parentd8c33747afbe98e893e0569f3bf45b67a9e8e728 (diff)
downloadframeworks_base-b3390135890800b9c5f0ab58ae3af80ab200dd8e.zip
frameworks_base-b3390135890800b9c5f0ab58ae3af80ab200dd8e.tar.gz
frameworks_base-b3390135890800b9c5f0ab58ae3af80ab200dd8e.tar.bz2
am d8c33747: am 78624e41: Add remove method in CameraParameters class.
Merge commit 'd8c33747afbe98e893e0569f3bf45b67a9e8e728' into kraken * commit 'd8c33747afbe98e893e0569f3bf45b67a9e8e728': Add remove method in CameraParameters class.
Diffstat (limited to 'libs/camera')
-rw-r--r--libs/camera/CameraParameters.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/libs/camera/CameraParameters.cpp b/libs/camera/CameraParameters.cpp
index d8f9c71..cfb7ba1 100644
--- a/libs/camera/CameraParameters.cpp
+++ b/libs/camera/CameraParameters.cpp
@@ -254,6 +254,11 @@ float CameraParameters::getFloat(const char *key) const
return strtof(v, 0);
}
+void CameraParameters::remove(const char *key)
+{
+ mMap.removeItem(String8(key));
+}
+
static int parse_size(const char *str, int &width, int &height)
{
// Find the width.