Merge "Camera: Expect physical results in the last partial notification" am: cecee13161

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1435036

Change-Id: I18791e18ce567404c19b3872426179a8ee6b2a7e
This commit is contained in:
Treehugger Robot
2020-11-13 21:08:37 +00:00
committed by Automerger Merge Worker

View File

@@ -1209,7 +1209,12 @@ bool CameraHidlTest::DeviceCb::processCaptureResultLocked(const CaptureResult& r
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());