diff options
| -rw-r--r-- | libs/binder/include_rpc_unstable/binder_rpc_unstable.hpp | 2 | ||||
| -rw-r--r-- | libs/binder/libbinder_rpc_unstable.cpp | 2 | ||||
| -rw-r--r-- | libs/binder/libbinder_rpc_unstable.map.txt | 2 | ||||
| -rw-r--r-- | libs/binder/rust/rpcbinder/src/client.rs | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/libs/binder/include_rpc_unstable/binder_rpc_unstable.hpp b/libs/binder/include_rpc_unstable/binder_rpc_unstable.hpp index 883ae315b2..e4a9f9975a 100644 --- a/libs/binder/include_rpc_unstable/binder_rpc_unstable.hpp +++ b/libs/binder/include_rpc_unstable/binder_rpc_unstable.hpp @@ -40,7 +40,7 @@ bool RunVsockRpcServerCallback(AIBinder* service, unsigned int port, bool RunVsockRpcServerWithFactory(AIBinder* (*factory)(unsigned int cid, void* context), void* factoryContext, unsigned int port); -AIBinder* RpcClient(unsigned int cid, unsigned int port); +AIBinder* VsockRpcClient(unsigned int cid, unsigned int port); // Connect to an RPC server with preconnected file descriptors. // diff --git a/libs/binder/libbinder_rpc_unstable.cpp b/libs/binder/libbinder_rpc_unstable.cpp index 49686e1ce6..1f38bb925c 100644 --- a/libs/binder/libbinder_rpc_unstable.cpp +++ b/libs/binder/libbinder_rpc_unstable.cpp @@ -74,7 +74,7 @@ bool RunVsockRpcServer(AIBinder* service, unsigned int port) { return RunVsockRpcServerCallback(service, port, nullptr, nullptr); } -AIBinder* RpcClient(unsigned int cid, unsigned int port) { +AIBinder* VsockRpcClient(unsigned int cid, unsigned int port) { auto session = RpcSession::make(); if (status_t status = session->setupVsockClient(cid, port); status != OK) { LOG(ERROR) << "Failed to set up vsock client with CID " << cid << " and port " << port diff --git a/libs/binder/libbinder_rpc_unstable.map.txt b/libs/binder/libbinder_rpc_unstable.map.txt index 15b6ee952c..347831a5fc 100644 --- a/libs/binder/libbinder_rpc_unstable.map.txt +++ b/libs/binder/libbinder_rpc_unstable.map.txt @@ -2,7 +2,7 @@ LIBBINDER_RPC_UNSTABLE_SHIM { # platform-only global: RunVsockRpcServer; RunVsockRpcServerCallback; - RpcClient; + VsockRpcClient; RpcPreconnectedClient; local: *; diff --git a/libs/binder/rust/rpcbinder/src/client.rs b/libs/binder/rust/rpcbinder/src/client.rs index 743800beb1..4343ff4f83 100644 --- a/libs/binder/rust/rpcbinder/src/client.rs +++ b/libs/binder/rust/rpcbinder/src/client.rs @@ -22,9 +22,9 @@ use std::os::{ /// Connects to an RPC Binder server over vsock. pub fn get_vsock_rpc_service(cid: u32, port: u32) -> Option<SpIBinder> { - // SAFETY: AIBinder returned by RpcClient has correct reference count, and the ownership can - // safely be taken by new_spibinder. - unsafe { new_spibinder(binder_rpc_unstable_bindgen::RpcClient(cid, port)) } + // SAFETY: AIBinder returned by VsockRpcClient has correct reference count, + // and the ownership can safely be taken by new_spibinder. + unsafe { new_spibinder(binder_rpc_unstable_bindgen::VsockRpcClient(cid, port)) } } /// Connects to an RPC Binder server for a particular interface over vsock. |