Merge "~RpcServer() calls shutdown explicitly." (de10257e) · Commits · e / os / android_frameworks_native-old

libs/binder/RpcServer.cpp

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -39,7 +39,9 @@ using base::ScopeGuard;
	using base::unique_fd;		using base::unique_fd;

	RpcServer::RpcServer() {}		RpcServer::RpcServer() {}
	RpcServer::~RpcServer() {}		RpcServer::~RpcServer() {
			(void)shutdown();
			}

	sp<RpcServer> RpcServer::make() {		sp<RpcServer> RpcServer::make() {
	return sp<RpcServer>::make();		return sp<RpcServer>::make();
	@@ -204,7 +206,6 @@ bool RpcServer::acceptOneNoCheck() {
	}		}

	bool RpcServer::shutdown() {		bool RpcServer::shutdown() {
	LOG_ALWAYS_FATAL_IF(!mAgreedExperimental, "no!");
	std::unique_lock<std::mutex> _l(mLock);		std::unique_lock<std::mutex> _l(mLock);
	if (mShutdownTrigger == nullptr) return false;		if (mShutdownTrigger == nullptr) return false;