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

Commit 26762cac authored by Changyeon Jo's avatar Changyeon Jo Committed by Automerger Merge Worker
Browse files

Merge "Update CameraStreamBuffering test case" into tm-dev am: df2bcbe6 am:... 

Merge "Update CameraStreamBuffering test case" into tm-dev am: df2bcbe6 am: 7eeb0410 am: c96af189

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



Change-Id: I154b69cec0376786101f43926b939bab3a614387
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d656b485 c96af189

automotive/evs/1.1/vts/functional/VtsHalEvsV1_1TargetTest.cpp

+2 −1
Original line number Diff line number Diff line
@@ -563,7 +563,8 @@ TEST_P(EvsHidlTest, CameraStreamBuffering) { 
        activeCameras.push_back(pCam);



        // Ask for a very large number of buffers in flight to ensure it errors correctly

        Return<EvsResult> badResult = pCam->setMaxFramesInFlight(0xFFFFFFFF);

        Return<EvsResult> badResult =

                pCam->setMaxFramesInFlight(std::numeric_limits<int32_t>::max());

        EXPECT_EQ(EvsResult::BUFFER_NOT_AVAILABLE, badResult);



        // Now ask for exactly two buffers in flight as we'll test behavior in that case

automotive/evs/aidl/vts/VtsHalEvsTargetTest.cpp

+1 −1
Original line number Diff line number Diff line
@@ -526,7 +526,7 @@ TEST_P(EvsAidlTest, CameraStreamBuffering) { 
        mActiveCameras.push_back(pCam);



        // Ask for a very large number of buffers in flight to ensure it errors correctly

        auto badResult = pCam->setMaxFramesInFlight(0xFFFFFFFF);

        auto badResult = pCam->setMaxFramesInFlight(std::numeric_limits<int32_t>::max());

        EXPECT_TRUE(!badResult.isOk() && badResult.getServiceSpecificError() ==

                                                 static_cast<int>(EvsResult::INVALID_ARG));