commit 720f744e11a74ac7495bdc2bc316ba7a7bdda5c2
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jan 25 01:53:34 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jan 25 01:53:34 2023 +0000
tree 6171d99774f810b56fd69c0bd2be3278d42399db
parent 76c91d0d01d9e04065cf4abdb0d19331bb4dba44
parent 3b92bb27d8bdb32872cb30626101c1b53be03b5f

Merge "binderLibTest: fix HangingServices race" am: b8977f1937 am: 3b92bb27d8

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

Change-Id: I023c9e9b27cc8696055034f04e70a437ca272fd2
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 f7498c4..955c650 100644
--- a/libs/binder/tests/binderLibTest.cpp
+++ b/libs/binder/tests/binderLibTest.cpp
@@ -1406,9 +1406,11 @@
     ASSERT_TRUE(server != nullptr);
     int32_t delay = 1000; // ms
     data.writeInt32(delay);
+    // b/266537959 - must take before taking lock, since countdown is started in the remote
+    // process there.
+    size_t epochMsBefore = epochMillis();
     EXPECT_THAT(server->transact(BINDER_LIB_TEST_PROCESS_TEMPORARY_LOCK, data, &reply), NO_ERROR);
     std::vector<std::thread> ts;
-    size_t epochMsBefore = epochMillis();
     for (size_t i = 0; i < kKernelThreads + 1; i++) {
         ts.push_back(std::thread([&] {
             Parcel local_reply;