| commit | 7eeb0410c849fae1c183ace30f1d40c8d9d6e9a9 | [log] [tgz] |
|---|---|---|
| author | Changyeon Jo <changyeon@google.com> | Mon May 02 22:22:56 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon May 02 22:22:56 2022 +0000 |
| tree | a108becc551b95d16d8abf0c52ecda3db95b9cee | |
| parent | 20f2a5414065184a768f763ab3c27e9a7a99177c [diff] | |
| parent | df2bcbe6e2950356165c8cc706daca9aef2f7cc9 [diff] |
Merge "Update CameraStreamBuffering test case" into tm-dev am: df2bcbe6e2 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/17915087 Change-Id: I19827fca7b3167d65b409586656b89c7914ef608 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));