| commit | 68388d3f45bee8b9533c070241319cf8cc07fcaa | [log] [tgz] |
|---|---|---|
| author | Devin Moore <devinmoore@google.com> | Wed Apr 05 19:43:57 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Apr 05 19:43:57 2023 +0000 |
| tree | 2b10c96e47e2ff8ab7ac433b4f46a1874b1cf5cd | |
| parent | 98c7d71dfe916506033366984b4b03585ee71d4a [diff] | |
| parent | 42c73a38fc6b2e78e6c7cbe33f9601ebaa245036 [diff] |
Merge "Clarify RpcServer shutdown error for corner case" am: 42c73a38fc Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2503961 Change-Id: Iccaffd678b178994c3f4bf7acf06147c60caa9ac Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/libs/binder/RpcServer.cpp b/libs/binder/RpcServer.cpp index 0d06e9e..851b407 100644 --- a/libs/binder/RpcServer.cpp +++ b/libs/binder/RpcServer.cpp
@@ -295,7 +295,8 @@ bool RpcServer::shutdown() { RpcMutexUniqueLock _l(mLock); if (mShutdownTrigger == nullptr) { - LOG_RPC_DETAIL("Cannot shutdown. No shutdown trigger installed (already shutdown?)"); + LOG_RPC_DETAIL("Cannot shutdown. No shutdown trigger installed (already shutdown, or not " + "joined yet?)"); return false; }