Merge "binderSafeInterfaceTest: another quick flake fix" into main am: e8f9d03 am: 4bb9fd0

Treehugger Robot · android-build-merge-worker-robot · commit 5d7cd395540f · 2025-01-03T15:09:28.000-08:00
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3436784 Change-Id: I74b4613aea9fdce10796ff1fbd31deb5ea41d9b3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/libs/binder/tests/binderSafeInterfaceTest.cpp b/libs/binder/tests/binderSafeInterfaceTest.cpp
@@ -789,7 +789,7 @@ TEST_F(SafeInterfaceTest, TestCallMeBack) {
         std::optional<int32_t> waitForCallback() {
             std::unique_lock<decltype(mMutex)> lock(mMutex);
             bool success =
-                    mCondition.wait_for(lock, 100ms, [&]() { return static_cast<bool>(mValue); });
+                    mCondition.wait_for(lock, 1000ms, [&]() { return static_cast<bool>(mValue); });
             return success ? mValue : std::nullopt;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -789,7 +789,7 @@ TEST_F(SafeInterfaceTest, TestCallMeBack) {`
`789`	`789`	`std::optional<int32_t> waitForCallback() {`
`790`	`790`	`std::unique_lock<decltype(mMutex)> lock(mMutex);`
`791`	`791`	`bool success =`
`792`		`- mCondition.wait_for(lock, 100ms, [&]() { return static_cast<bool>(mValue); });`
	`792`	`+ mCondition.wait_for(lock, 1000ms, [&]() { return static_cast<bool>(mValue); });`
`793`	`793`	`return success ? mValue : std::nullopt;`
`794`	`794`	`}`
`795`	`795`