Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4bb9fd02 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "binderSafeInterfaceTest: another quick flake fix" into main am: e8f9d035 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3436784



Change-Id: I047fe4f97974e0b6f59a482c3b6646e642f1b88a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a16503e4 e8f9d035

libs/binder/tests/binderSafeInterfaceTest.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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;

        }