commit e33822c0d9b88bbd4cc74d9a41dbfd4ed24012a6
author Emilian Peev <epeev@google.com> Tue Sep 22 13:31:05 2020 -0700
committer Emilian Peev <epeev@google.com> Wed Sep 23 16:10:11 2020 +0000
tree 8bbbaaafc763d9db408925ea2dc324fdb45a98a3
parent 51dc008bd38dc006061ac3f0053c48f1e0671054

Camera: Expect physical results in the last partial notification

Per API specification the physical device capture results will only
be part of the last/final partial result notification.

Bug: 165476824
Test: adb shell
/data/nativetest64/VtsHalCameraProviderV2_4TargetTest/VtsHalCameraProviderV2_4TargetTest

Change-Id: I0aa860b10ed2bd30c46f58ad0ee530c740f1f5d6

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 f6f8a8e..23ebf10 100644
--- a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
+++ b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
@@ -1209,7 +1209,12 @@
             return notify;
         }
 
-        if (physicalCameraMetadata.size() != request->expectedPhysicalResults.size()) {
+        // Physical device results are only expected in the last/final
+        // partial result notification.
+        bool expectPhysicalResults = !(request->usePartialResult &&
+                (results.partialResult < request->numPartialResults));
+        if (expectPhysicalResults &&
+                (physicalCameraMetadata.size() != request->expectedPhysicalResults.size())) {
             ALOGE("%s: Frame %d: Returned physical metadata count %zu "
                     "must be equal to expected count %zu", __func__, frameNumber,
                     physicalCameraMetadata.size(), request->expectedPhysicalResults.size());