commit 620fd684f5ee3329a31d801f096eab6f9d14d2d5
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jul 15 19:37:00 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jul 15 19:37:00 2021 +0000
tree cd0ab260d59cd3a88155c809f6bea7bf85c05974
parent 187e6a2034c4be04cb9006f269e0877bc972f832
parent 5e94b8fb034f851e2102e0ca4539ac2440136a5d

Merge "libbinder: better RpcSession shutdown detail logs" am: f94b148bbd am: 59f39095fe am: edff82ea53 am: 5e94b8fb03

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

Change-Id: Ic06c9dde8906da27d98b728770fcb0fc0b738cc4

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