Merge "libbinder: addClient->addClientConnection" (7e563f09) · Commits · e / os / android_frameworks_native-old

libs/binder/RpcSession.cpp

+3 −3

Original line number	Diff line number	Diff line
		@@ -84,7 +84,7 @@ bool RpcSession::addNullDebuggingClient() {
		return false;
		}

		addClient(std::move(serverFd));
		addClientConnection(std::move(serverFd));
		return true;
		}

		@@ -255,7 +255,7 @@ bool RpcSession::setupOneSocketClient(const RpcSocketAddress& addr, int32_t id)

		LOG_RPC_DETAIL("Socket at %s client with fd %d", addr.toString().c_str(), serverFd.get());

		addClient(std::move(serverFd));
		addClientConnection(std::move(serverFd));
		return true;
		}

		@@ -263,7 +263,7 @@ bool RpcSession::setupOneSocketClient(const RpcSocketAddress& addr, int32_t id)
		return false;
		}

		void RpcSession::addClient(unique_fd fd) {
		void RpcSession::addClientConnection(unique_fd fd) {
		std::lock_guard<std::mutex> _l(mMutex);
		sp<RpcConnection> session = sp<RpcConnection>::make();
		session->fd = std::move(fd);

+1 −1

Original line number	Diff line number	Diff line
		@@ -128,7 +128,7 @@ private:

		bool setupSocketClient(const RpcSocketAddress& address);
		bool setupOneSocketClient(const RpcSocketAddress& address, int32_t sessionId);
		void addClient(base::unique_fd fd);
		void addClientConnection(base::unique_fd fd);
		void setForServer(const wp<RpcServer>& server, int32_t sessionId);
		sp<RpcConnection> assignServerToThisThread(base::unique_fd fd);
		bool removeServerConnection(const sp<RpcConnection>& connection);