commit c8c256b623789fdb6eadb4a6821f09dd4bb9c60b
author Steven Moreland <smoreland@google.com> Tue May 11 22:59:09 2021 +0000
committer Steven Moreland <smoreland@google.com> Tue May 11 22:59:09 2021 +0000
tree 5d14c3e24deb5b9084c009f2e3bda2489c01e4eb
parent 1be9135083d7a5797fb1f84a11969bb4d4aaad41

libbinder: addClient->addClientConnection

To match previous s/mServers|mClients/\0Connections/g change.

Bug: N/A
Test: N/A
Change-Id: Id47410ad27ba78e57b5677dbeaa0435e25343b8b

libs/binder/RpcSession.cpp

diff --git a/libs/binder/RpcSession.cpp b/libs/binder/RpcSession.cpp
index 3e83c99..f38135b 100644
--- a/libs/binder/RpcSession.cpp
+++ b/libs/binder/RpcSession.cpp
@@ -84,7 +84,7 @@
         return false;
     }
 
-    addClient(std::move(serverFd));
+    addClientConnection(std::move(serverFd));
     return true;
 }
 
@@ -255,7 +255,7 @@
 
         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 @@
     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);

libs/binder/include/binder/RpcSession.h

diff --git a/libs/binder/include/binder/RpcSession.h b/libs/binder/include/binder/RpcSession.h
index 1657167..c8ab9e4 100644
--- a/libs/binder/include/binder/RpcSession.h
+++ b/libs/binder/include/binder/RpcSession.h
@@ -128,7 +128,7 @@
 
     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);