commit d90c33f66f8ffd52d723b2c1c9f320c16e63ad27
author Steven Moreland <smoreland@google.com> Tue Sep 21 00:51:47 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Sep 21 00:51:47 2021 +0000
tree 213d2e6ef81066c64d64b6739094389fea4fe60c
parent 2da714efc7f8954a32fa13f7e38729a8b79bab0d
parent 0c34302e211e32953cadd0f9dd73f4f22a629c33

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

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

Change-Id: Ief54f3c4e19f7a104d21cb06ce15b8ec73d4d84c

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);
         }