Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ee6110e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "Camera: Expect physical results in the last partial notification" am: cecee131 am: f026f3e5 am: 5bb75409

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

Change-Id: Id31aef9259e8a30fb77bd22bd2bd9f8afddc726e
parents 3453a4d1 5bb75409

camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp

+6 −1
Original line number Original line Diff line number Diff line
@@ -1209,7 +1209,12 @@ bool CameraHidlTest::DeviceCb::processCaptureResultLocked(const CaptureResult& r 
            return notify;

            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 "

            ALOGE("%s: Frame %d: Returned physical metadata count %zu "

                    "must be equal to expected count %zu", __func__, frameNumber,

                    "must be equal to expected count %zu", __func__, frameNumber,

                    physicalCameraMetadata.size(), request->expectedPhysicalResults.size());

                    physicalCameraMetadata.size(), request->expectedPhysicalResults.size());