commit 908fd8653f7d9c2910589e95222f9177903319a9
author TreeHugger Robot <treehugger-gerrit@google.com> Thu May 17 16:38:03 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 17 16:38:03 2018 +0000
tree 4443f88886243a9f7dfed1e4cac3624b699e450b
parent 3569b0273f63084f3304df1e7870e02d9c5d4c2b
parent 154e66e57a1796c2ce9b7581b34aba3459b304f8

Merge "Camera: Append non-partial results" into pi-dev

camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp

diff --git a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
index baffc78..ff7c0ee 100644
--- a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
+++ b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
@@ -1013,6 +1013,10 @@
 
         isPartialResult =
             (results.partialResult < request->numPartialResults);
+    } else if (resultSize > 0) {
+        request->collectedResult.append(reinterpret_cast<const camera_metadata_t*>(
+                    resultMetadata.data()));
+        isPartialResult = false;
     }
 
     hasInputBufferInRequest = request->hasInputBuffer;