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

Commit 12528b18 authored by Devin Moore's avatar Devin Moore Committed by Automerger Merge Worker
Browse files

Merge "binderRpcTest: assert on wait_for timeout" am: 453334da am:... 

Merge "binderRpcTest: assert on wait_for timeout" am: 453334da am: 91327817 am: c1438662 am: 29d6ddfc

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



Change-Id: Ie7b45ebaab8e7ae3d2b936e7a8afa4a6d128f0a4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e3f13500 29d6ddfc

libs/binder/tests/binderRpcTest.cpp

+1 −4
Original line number Diff line number Diff line
@@ -1095,10 +1095,7 @@ TEST_P(BinderRpc, SingleDeathRecipient) { 
    }



    std::unique_lock<std::mutex> lock(dr->mMtx);

    if (!dr->dead) {

        EXPECT_EQ(std::cv_status::no_timeout, dr->mCv.wait_for(lock, 1000ms));

    }

    EXPECT_TRUE(dr->dead) << "Failed to receive the death notification.";

    ASSERT_TRUE(dr->mCv.wait_for(lock, 1000ms, [&]() { return dr->dead; }));



    // need to wait for the session to shutdown so we don't "Leak session"

    EXPECT_TRUE(proc.proc.sessions.at(0).session->shutdownAndWait(true));