| commit | 9e7e1717e4c27a3686de2af02b5da80fb0cb4a70 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Jun 14 23:23:09 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jun 14 23:23:09 2023 +0000 |
| tree | a94406f58c4c340942b0355bce0bcd6ec462c810 | |
| parent | 744f71638e59fbf21ae00801fae1bb9771ca293c [diff] | |
| parent | 14f09ec7d1614a57e468a82dce469730768f503e [diff] |
Merge "binderRpcTest: threadpool race leak" am: bdac3ea1c2 am: a51585cb19 am: 14f09ec7d1 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2626196 Change-Id: If2e65861596b5a9a93ac9f8b79c461127e303abc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/libs/binder/tests/binderRpcTest.cpp b/libs/binder/tests/binderRpcTest.cpp index 1ff1de4..d352ce5 100644 --- a/libs/binder/tests/binderRpcTest.cpp +++ b/libs/binder/tests/binderRpcTest.cpp
@@ -691,7 +691,11 @@ EXPECT_EQ(nullptr, session.promote()); - sleep(1); // give time for remote session to shutdown + // now that it has died, wait for the remote session to shutdown + std::vector<int32_t> remoteCounts; + do { + EXPECT_OK(proc.rootIface->countBinders(&remoteCounts)); + } while (remoteCounts.size() > 1); } TEST_P(BinderRpc, SingleDeathRecipient) {