commit f3538ab1c6424d3f8a4ca81d52dc8578b439b69f
author Steven Moreland <smoreland@google.com> Tue Sep 21 01:10:49 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Sep 21 01:10:49 2021 +0000
tree 054ec21f8cde2b063e9c5210427e63bbb2698f54
parent 30522d07b467296a93dd7c5acb369111c5158fcc
parent d90c33f66f8ffd52d723b2c1c9f320c16e63ad27

Merge "binder_rpc_session: wait longer to shutdown" am: 5d4da609ef am: 0c34302e21 am: d90c33f66f

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

Change-Id: If93206a1e4d890339a42812887df36fd6e6df003

libs/binder/tests/rpc_fuzzer/main.cpp

diff --git a/libs/binder/tests/rpc_fuzzer/main.cpp b/libs/binder/tests/rpc_fuzzer/main.cpp
index 47a9913..c848798 100644
--- a/libs/binder/tests/rpc_fuzzer/main.cpp
+++ b/libs/binder/tests/rpc_fuzzer/main.cpp
@@ -100,7 +100,7 @@
 
     if (hangupBeforeShutdown) {
         connections.clear();
-        while (!server->listSessions().empty() && server->numUninitializedSessions()) {
+        while (!server->listSessions().empty() || server->numUninitializedSessions()) {
             // wait for all threads to finish processing existing information
             usleep(1);
         }