summaryrefslogtreecommitdiffstats
path: root/camera
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2013-07-08 12:20:16 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-07-08 12:20:16 -0700
commit8ebdfa8b021ed338f9916a1f30d756b989afa3bd (patch)
tree61a4c5ce548145dd0fe1409ecd2d95f359b42edb /camera
parentc26ab375ebb1bce6c3a99a46a72d8369170255ca (diff)
parent5de9ef20d596bc20f53cba664f1ac7e358910ea2 (diff)
downloadframeworks_av-8ebdfa8b021ed338f9916a1f30d756b989afa3bd.zip
frameworks_av-8ebdfa8b021ed338f9916a1f30d756b989afa3bd.tar.gz
frameworks_av-8ebdfa8b021ed338f9916a1f30d756b989afa3bd.tar.bz2
am 5de9ef20: am 365ed394: Merge "Typo in CameraParameters::set"
* commit '5de9ef20d596bc20f53cba664f1ac7e358910ea2': Typo in CameraParameters::set
Diffstat (limited to 'camera')
-rw-r--r--camera/CameraParameters.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/camera/CameraParameters.cpp b/camera/CameraParameters.cpp
index d10f2e5..c51f265 100644
--- a/camera/CameraParameters.cpp
+++ b/camera/CameraParameters.cpp
@@ -242,7 +242,7 @@ void CameraParameters::set(const char *key, const char *value)
return;
}
- if (strchr(value, '=') || strchr(key, ';')) {
+ if (strchr(value, '=') || strchr(value, ';')) {
//XXX ALOGE("Value \"%s\"contains invalid character (= or ;)", value);
return;
}