commit df2bcbe6e2950356165c8cc706daca9aef2f7cc9
author Changyeon Jo <changyeon@google.com> Mon May 02 21:57:32 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 02 21:57:32 2022 +0000
tree a108becc551b95d16d8abf0c52ecda3db95b9cee
parent dd890b58457734d44e4e2af87fb1343d2348689e
parent 0d814ce524770ef201c11ecb1ac57ec5328c13fa

Merge "Update CameraStreamBuffering test case" into tm-dev

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

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

automotive/evs/aidl/vts/VtsHalEvsTargetTest.cpp

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));