commit 59f39095fe8e74c0f0b2abf3faf10b0cf84db5bb
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jul 15 18:33:26 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jul 15 18:33:26 2021 +0000
tree 55f59beccce7c1850bf6e9c6f5c2f7391ad1e1e4
parent 60aa427cf43a2ddf3dfafb7f6ce94a8a6db15108
parent f94b148bbd15df6a74679f578527f4a404e973a1

Merge "libbinder: better RpcSession shutdown detail logs" am: f94b148bbd

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

Change-Id: I11ce12d4ecaa5c5fc713642b03f60d830d61ffec

libs/binder/RpcServer.cpp

diff --git a/libs/binder/RpcServer.cpp b/libs/binder/RpcServer.cpp
index 555c5ed..b521266 100644
--- a/libs/binder/RpcServer.cpp
+++ b/libs/binder/RpcServer.cpp
@@ -182,7 +182,7 @@
 bool RpcServer::shutdown() {
     std::unique_lock<std::mutex> _l(mLock);
     if (mShutdownTrigger == nullptr) {
-        LOG_RPC_DETAIL("Cannot shutdown. No shutdown trigger installed.");
+        LOG_RPC_DETAIL("Cannot shutdown. No shutdown trigger installed (already shutdown?)");
         return false;
     }
 
@@ -212,6 +212,8 @@
         mJoinThread.reset();
     }
 
+    LOG_RPC_DETAIL("Finished waiting on shutdown.");
+
     mShutdownTrigger = nullptr;
     return true;
 }