commit 47eec10dd5136d1123332c1f6ce7210ffca82a55
author Igor Murashkin <iam@google.com> Tue Apr 02 14:13:02 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Apr 02 14:13:02 2013 -0700
tree 17859e9a9b790c55412f0adff92cd4731f0acb41
parent 3682bccf805df8b854e3f465e2df614a5d583648
parent d2c90696403bb3c9e28d7b51d65c9468bdf8e78b

am b7c9d61b: Camera3: Fix metadata result not being rewritten after capture

* commit 'b7c9d61b9d398b272c8138a2c6aace069229ac03':
  Camera3: Fix metadata result not being rewritten after capture

services/camera/libcameraservice/Camera3Device.cpp

diff --git a/services/camera/libcameraservice/Camera3Device.cpp b/services/camera/libcameraservice/Camera3Device.cpp
index 6cf652c..f2c8c04 100644
--- a/services/camera/libcameraservice/Camera3Device.cpp
+++ b/services/camera/libcameraservice/Camera3Device.cpp
@@ -899,11 +899,19 @@
 
         // Push result metadata into queue
         mResultQueue.push_back(CameraMetadata());
-        CameraMetadata &captureResult = *(mResultQueue.end());
+        // Lets avoid copies! Too bad there's not a #back method
+        CameraMetadata &captureResult = *(--mResultQueue.end());
 
         captureResult = result->result;
-        captureResult.update(ANDROID_REQUEST_FRAME_COUNT,
-                (int32_t*)&result->frame_number, 1);
+        if (captureResult.update(ANDROID_REQUEST_FRAME_COUNT,
+                (int32_t*)&result->frame_number, 1) != OK) {
+            ALOGE("%s: Camera %d: Failed to set frame# in metadata (%d)",
+                  __FUNCTION__, mId, result->frame_number);
+            // TODO: Report error upstream
+        } else {
+            ALOGVV("%s: Camera %d: Set frame# in metadata (%d)",
+                  __FUNCTION__, mId, result->frame_number);
+        }
 
         // Get timestamp from result metadata