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