Merge "RPC Binder: log unexpected transport errors" into main (b8337c6f) · Commits · e / os / android_frameworks_native

libs/binder/RpcState.cpp

+14 −4

Original line number	Diff line number	Diff line
		@@ -390,8 +390,13 @@ status_t RpcState::rpcSend(const sp<RpcSession::RpcConnection>& connection,
		iovs, niovs, altPoll,
		ancillaryFds);
		status != OK) {
		LOG_RPC_DETAIL("Failed to write %s (%d iovs) on RpcTransport %p, error: %s", what, niovs,
		if (status == DEAD_OBJECT \|\| status == -ECONNRESET) {
		LOG_RPC_DETAIL("Failed to write %s (%d iovs) on RpcTransport %p, error: %s", what,
		niovs, connection->rpcTransport.get(), statusToString(status).c_str());
		} else {
		ALOGE("Failed to write %s (%d iovs) on RpcTransport %p, error: %s", what, niovs,
		connection->rpcTransport.get(), statusToString(status).c_str());
		}
		(void)session->shutdownAndWait(false);
		return status;
		}
		@@ -408,8 +413,13 @@ status_t RpcState::rpcRec(const sp<RpcSession::RpcConnection>& connection,
		iovs, niovs, std::nullopt,
		ancillaryFds);
		status != OK) {
		if (status == DEAD_OBJECT \|\| status == -ECONNRESET) {
		LOG_RPC_DETAIL("Failed to read %s (%d iovs) on RpcTransport %p, error: %s", what, niovs,
		connection->rpcTransport.get(), statusToString(status).c_str());
		} else {
		ALOGE("Failed to read %s (%d iovs) on RpcTransport %p, error: %s", what, niovs,
		connection->rpcTransport.get(), statusToString(status).c_str());
		}
		(void)session->shutdownAndWait(false);
		return status;
		}