commit a31c6c8e06b170c27728c39a20bf425d697f8bb3
author Elie Kheirallah <khei@google.com> Sat Jun 11 01:41:01 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Jun 11 01:41:01 2022 +0000
tree 169c88803859c61c7656dd75e68633fa0e0608c8
parent eee84856be180713b1bb5c5e9cd789046a507592
parent 3053cf32f8c5a59e12a2b92083eb5a2670961c02

Merge "binderLibTest HangingServices and ThreadPoolAvailableThreads fix" am: 8005f7eae5 am: 7334254749 am: 63e3c95690 am: 914338c2e3 am: 3053cf32f8

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

Change-Id: If872ba42538504eeaa02a5f5927253e98a35015a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

libs/binder/tests/binderLibTest.cpp

diff --git a/libs/binder/tests/binderLibTest.cpp b/libs/binder/tests/binderLibTest.cpp
index 3e90726..cf3e6ca 100644
--- a/libs/binder/tests/binderLibTest.cpp
+++ b/libs/binder/tests/binderLibTest.cpp
@@ -1264,7 +1264,9 @@
     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 @@
     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);
         }));
     }