| commit | 29368c06d3ff4353c6a0c0944b597ad932eec6bf | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Nov 13 21:52:52 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Nov 13 21:52:52 2020 +0000 |
| tree | 5003ee2ad4e309d4711de424b87ae1ba37e731ff | |
| parent | 5c9ad33f9ace0f40ce7b96faf9a32d5259fe73f8 [diff] | |
| parent | 3ee6110e353dc92ed5e07ff62848730732171e57 [diff] |
Merge "Camera: Expect physical results in the last partial notification" am: cecee13161 am: f026f3e5fe am: 5bb754093a am: 3ee6110e35 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1435036 Change-Id: I8dcaf8ccfc584c2ba6a53fee3eff06d8f1b6f80a
diff --git a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp index aa5c48f..f1f0f18 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());