summaryrefslogtreecommitdiffstats
path: root/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
commit83e5a900e5eccbd2af300c03d24d72365d0c8323 (patch)
treeec052ddb975e64a27fdf12ade7e24df07f899b04 /camera
parentef9d0cd72e476a4b7556833fb09505a51b626797 (diff)
parentadbda96f6a05507788bb4163d7fbe8a95948f0a5 (diff)
downloadframeworks_av-83e5a900e5eccbd2af300c03d24d72365d0c8323.zip
frameworks_av-83e5a900e5eccbd2af300c03d24d72365d0c8323.tar.gz
frameworks_av-83e5a900e5eccbd2af300c03d24d72365d0c8323.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 'camera')
-rw-r--r--camera/CameraParameters.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/camera/CameraParameters.cpp b/camera/CameraParameters.cpp
index d8f9c71..cfb7ba1 100644
--- a/camera/CameraParameters.cpp
+++ b/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.