commit 327e5312b84731ff0dbe1a7e59672e7dc0a36843
author Emilian Peev <epeev@google.com> Thu May 17 09:53:24 2018 -0700
committer android-build-merger <android-build-merger@google.com> Thu May 17 09:53:24 2018 -0700
tree 089ffb76b4efdc2cf3510c65d23cee42f7281ef1
parent cdd39fb0d7c6a3a6c136c0c1379249ca83e2207c
parent 908fd8653f7d9c2910589e95222f9177903319a9

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

Change-Id: I4bd6b02fd8502345982d1578771cc5ef9ab9853c

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;