commit 3710db80d4b9e573d775790e4c9a2ab6e062201e
author Igor Murashkin <iam@google.com> Thu Jul 18 20:11:17 2013 -0700
committer Igor Murashkin <iam@google.com> Fri Jul 19 12:04:48 2013 -0700
tree 75ca64515cc2aba0f97c9334e454bf0d90636d78
parent 27b62ae8eb4623cef45d29c704aaf169f8c76025

camera2 api: marshal rect, size, string for metadata

Change-Id: Iec2fd823bc92394da44abb32ca38a625d7638e3d

core/jni/android_hardware_photography_CameraMetadata.cpp

diff --git a/core/jni/android_hardware_photography_CameraMetadata.cpp b/core/jni/android_hardware_photography_CameraMetadata.cpp
index 5070d2c..5190a37 100644
--- a/core/jni/android_hardware_photography_CameraMetadata.cpp
+++ b/core/jni/android_hardware_photography_CameraMetadata.cpp
@@ -267,7 +267,13 @@
 
     if (src == NULL) {
         // If array is NULL, delete the entry
-        res = metadata->erase(tag);
+        if (metadata->exists(tag)) {
+            res = metadata->erase(tag);
+            ALOGV("%s: Erase values (res = %d)", __FUNCTION__, res);
+        } else {
+            res = OK;
+            ALOGV("%s: Don't need to erase", __FUNCTION__);
+        }
     } else {
         // Copy from java array into native array
         ScopedByteArrayRO arrayReader(env, src);
@@ -275,6 +281,8 @@
 
         res = Helpers::updateAny(metadata, static_cast<uint32_t>(tag),
                                  tagType, arrayReader.get(), arrayReader.size());
+
+        ALOGV("%s: Update values (res = %d)", __FUNCTION__, res);
     }
 
     if (res == OK) {