summaryrefslogtreecommitdiff
path: root/libs/binder/RpcState.cpp
diff options
context:
space:
mode:
author Steven Moreland <smoreland@google.com> 2021-09-13 16:27:34 -0700
committer Steven Moreland <smoreland@google.com> 2021-09-13 16:41:28 -0700
commit99157624317005011ae57e15a6482c35cea085e5 (patch)
tree4219b6435370e4cd20ff69914bf5105baeb6a0a4 /libs/binder/RpcState.cpp
parent728587b2851fa5aab102a16d55048a8deb23f18e (diff)
libbinder: hide BpBinder::create(*) functions
There is no need to have these around, and having them exposed potentially means they could be stuck in the ABI. They are created (instead of absorbed into the private constructors) because of the additional UID tracking logic there. Bug: 167966510 Test: binderRpcTest Change-Id: I673d7a4c591a1b004f3214e8a17b48e54e91171d
Diffstat (limited to 'libs/binder/RpcState.cpp')
-rw-r--r--libs/binder/RpcState.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/libs/binder/RpcState.cpp b/libs/binder/RpcState.cpp
index 59643ba4ee..11a083ac11 100644
--- a/libs/binder/RpcState.cpp
+++ b/libs/binder/RpcState.cpp
@@ -56,7 +56,7 @@ status_t RpcState::onBinderLeaving(const sp<RpcSession>& session, const sp<IBind
bool isRemote = binder->remoteBinder();
bool isRpc = isRemote && binder->remoteBinder()->isRpcBinder();
- if (isRpc && binder->remoteBinder()->getPrivateAccessorForId().rpcSession() != session) {
+ if (isRpc && binder->remoteBinder()->getPrivateAccessor().rpcSession() != session) {
// We need to be able to send instructions over the socket for how to
// connect to a different server, and we also need to let the host
// process know that this is happening.
@@ -85,8 +85,7 @@ status_t RpcState::onBinderLeaving(const sp<RpcSession>& session, const sp<IBind
if (binder == node.binder) {
if (isRpc) {
// check integrity of data structure
- uint64_t actualAddr =
- binder->remoteBinder()->getPrivateAccessorForId().rpcAddress();
+ uint64_t actualAddr = binder->remoteBinder()->getPrivateAccessor().rpcAddress();
LOG_ALWAYS_FATAL_IF(addr != actualAddr, "Address mismatch %" PRIu64 " vs %" PRIu64,
addr, actualAddr);
}
@@ -185,7 +184,7 @@ status_t RpcState::onBinderEntering(const sp<RpcSession>& session, uint64_t addr
// Currently, all binders are assumed to be part of the same session (no
// device global binders in the RPC world).
- it->second.binder = *out = BpBinder::create(session, it->first);
+ it->second.binder = *out = BpBinder::PrivateAccessor::create(session, it->first);
it->second.timesRecd = 1;
return OK;
}