summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2025-01-14 17:27:50 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2025-01-14 17:27:50 -0800
commit12a57e3f4297cfc69a66fa5951853638fa619e01 (patch)
treec6c4f0ef6fc1286f55d06ae1b71b77e618aeb133
parentcbd17640348b5de696798960e286e83c70e99b44 (diff)
parent2446f1d6384d3d4dccedd7fb857aec39278fef19 (diff)
Merge "binder RPC: quick callbacks flake" into main
-rw-r--r--libs/binder/tests/binderRpcUniversalTests.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/binder/tests/binderRpcUniversalTests.cpp b/libs/binder/tests/binderRpcUniversalTests.cpp
index c6fd4870a0..4b9dcf85d2 100644
--- a/libs/binder/tests/binderRpcUniversalTests.cpp
+++ b/libs/binder/tests/binderRpcUniversalTests.cpp
@@ -498,9 +498,9 @@ TEST_P(BinderRpc, Callbacks) {
// same thread, everything should have happened in a nested call. Otherwise,
// the callback will be processed on another thread.
if (callIsOneway || callbackIsOneway || delayed) {
- using std::literals::chrono_literals::operator""s;
+ using std::literals::chrono_literals::operator""ms;
RpcMutexUniqueLock _l(cb->mMutex);
- cb->mCv.wait_for(_l, 1s, [&] { return !cb->mValues.empty(); });
+ cb->mCv.wait_for(_l, 1500ms, [&] { return !cb->mValues.empty(); });
}
EXPECT_EQ(cb->mValues.size(), 1UL)