Merge "libbinder: better RpcSession shutdown detail logs" am: f94b148bbd am: 59f39095fe (edff82ea) · Commits · e / os / android_frameworks_native-old

libs/binder/RpcServer.cpp

+3 −1

Original line number	Diff line number	Diff line
		@@ -182,7 +182,7 @@ void RpcServer::join() {
		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 @@ bool RpcServer::shutdown() {
		mJoinThread.reset();
		}

		LOG_RPC_DETAIL("Finished waiting on shutdown.");

		mShutdownTrigger = nullptr;
		return true;
		}