| commit | b54a30836471d096d707509c8e1c6f54433a6014 | [log] [tgz] |
|---|---|---|
| author | Changyeon Jo <changyeon@google.com> | Mon May 02 22:38:50 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon May 02 22:38:50 2022 +0000 |
| tree | f4e8ae37814dfa21eb376ef0b20457f70de5d769 | |
| parent | 95b968802b9f715ab0d9389a2ac77bb59bf2be2a [diff] | |
| parent | 89d1efe0c177a8ef486d8250b808b464d3d98837 [diff] |
Merge "Update CameraStreamBuffering test case" into tm-dev am: df2bcbe6e2 am: 89d1efe0c1 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/17915087 Change-Id: I4a29bf785180a4a823f24b5c3f443b116506047c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/automotive/evs/1.1/vts/functional/VtsHalEvsV1_1TargetTest.cpp b/automotive/evs/1.1/vts/functional/VtsHalEvsV1_1TargetTest.cpp index 84323ea..623438f 100644 --- a/automotive/evs/1.1/vts/functional/VtsHalEvsV1_1TargetTest.cpp +++ b/automotive/evs/1.1/vts/functional/VtsHalEvsV1_1TargetTest.cpp
@@ -563,7 +563,8 @@ 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
diff --git a/automotive/evs/aidl/vts/VtsHalEvsTargetTest.cpp b/automotive/evs/aidl/vts/VtsHalEvsTargetTest.cpp index a442368..09e1088 100644 --- a/automotive/evs/aidl/vts/VtsHalEvsTargetTest.cpp +++ b/automotive/evs/aidl/vts/VtsHalEvsTargetTest.cpp
@@ -526,7 +526,7 @@ 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));