From 7595c47b4842d76dba0fcf26ef3ab98d215efe1e Mon Sep 17 00:00:00 2001 From: Zhijun He Date: Thu, 27 Mar 2014 16:46:15 -0700 Subject: CameraMetadata: Fix String tag update null character issue String8.size() doesn't count the null character in whatever case. But camera metadata tag android.jpeg.gpsProcessingMethod need a null-terminited string. Bug: 13679912 Change-Id: I91e742702b16b9ab9b42f9822de189a9a96e8e53 --- camera/CameraMetadata.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'camera/CameraMetadata.cpp') diff --git a/camera/CameraMetadata.cpp b/camera/CameraMetadata.cpp index 6b726e0..1567cd1 100644 --- a/camera/CameraMetadata.cpp +++ b/camera/CameraMetadata.cpp @@ -273,7 +273,8 @@ status_t CameraMetadata::update(uint32_t tag, if ( (res = checkType(tag, TYPE_BYTE)) != OK) { return res; } - return updateImpl(tag, (const void*)string.string(), string.size()); + // string.size() doesn't count the null termination character. + return updateImpl(tag, (const void*)string.string(), string.size() + 1); } status_t CameraMetadata::updateImpl(uint32_t tag, const void *data, -- cgit v1.1