| commit | a51585cb19988cd9bc1af8d4ab0a3e66b664cef7 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Jun 14 21:55:33 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jun 14 21:55:33 2023 +0000 |
| tree | 7ea53258b840cfdf83a03daaa0f7453791d39f3f | |
| parent | a08e29b370ff83afd46505bfeae76328d8a5da06 [diff] | |
| parent | bdac3ea1c249600346f7e3db8949e72b9097338a [diff] |
Merge "binderRpcTest: threadpool race leak" am: bdac3ea1c2 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2626196 Change-Id: I5e0e3d45ea0e282c03bf491b1124ac23f46bf9cb 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) {