summaryrefslogtreecommitdiffstats
path: root/camera
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2013-07-08 12:23:00 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-07-08 12:23:00 -0700
commit91a582c46758949c8ac205507d72595c8c0fe1f3 (patch)
treea61b7bf4238aae6aa12eb1dead7bc336c1bbdfb9 /camera
parent680e9b590abab6a6cc10062a5c09037d9445fbdd (diff)
parent8ebdfa8b021ed338f9916a1f30d756b989afa3bd (diff)
downloadframeworks_av-91a582c46758949c8ac205507d72595c8c0fe1f3.zip
frameworks_av-91a582c46758949c8ac205507d72595c8c0fe1f3.tar.gz
frameworks_av-91a582c46758949c8ac205507d72595c8c0fe1f3.tar.bz2
am 8ebdfa8b: am 5de9ef20: am 365ed394: Merge "Typo in CameraParameters::set"
* commit '8ebdfa8b021ed338f9916a1f30d756b989afa3bd': 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;
}