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

Commit a31c6c8e authored by Elie Kheirallah's avatar Elie Kheirallah Committed by Automerger Merge Worker
Browse files

Merge "binderLibTest HangingServices and ThreadPoolAvailableThreads fix" am:... 

Merge "binderLibTest HangingServices and ThreadPoolAvailableThreads fix" am: 8005f7ea am: 73342547 am: 63e3c956 am: 914338c2 am: 3053cf32

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



Change-Id: If872ba42538504eeaa02a5f5927253e98a35015a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents eee84856 3053cf32

libs/binder/tests/binderLibTest.cpp

+6 −2
Original line number Diff line number Diff line
@@ -1264,7 +1264,9 @@ TEST_F(BinderLibTest, ThreadPoolAvailableThreads) { 
    std::vector<std::thread> ts;

    for (size_t i = 0; i < kKernelThreads - 1; i++) {

        ts.push_back(std::thread([&] {

            EXPECT_THAT(server->transact(BINDER_LIB_TEST_LOCK_UNLOCK, data, &reply), NO_ERROR);

            Parcel local_reply;

            EXPECT_THAT(server->transact(BINDER_LIB_TEST_LOCK_UNLOCK, data, &local_reply),

                        NO_ERROR);

        }));

    }
@@ -1302,7 +1304,9 @@ TEST_F(BinderLibTest, HangingServices) { 
    size_t epochMsBefore = epochMillis();

    for (size_t i = 0; i < kKernelThreads + 1; i++) {

        ts.push_back(std::thread([&] {

            EXPECT_THAT(server->transact(BINDER_LIB_TEST_LOCK_UNLOCK, data, &reply), NO_ERROR);

            Parcel local_reply;

            EXPECT_THAT(server->transact(BINDER_LIB_TEST_LOCK_UNLOCK, data, &local_reply),

                        NO_ERROR);

        }));

    }