| commit | 5bb754093a01d0d96c9be3ae758b9e32c97cbade | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Nov 13 21:28:30 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Nov 13 21:28:30 2020 +0000 |
| tree | e303bf557d403f910081651323a5cc94874987e3 | |
| parent | 5e00533a4427e09c2a374308e1be1811fa8364e1 [diff] | |
| parent | f026f3e5fed68ff8ea35191bb07db736fc261226 [diff] |
Merge "Camera: Expect physical results in the last partial notification" am: cecee13161 am: f026f3e5fe Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1435036 Change-Id: I0f6bc521094e2643c8f309bc13122f498879ae8c
diff --git a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp index 44eccd3..2099dc0 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());