diff options
| author | 2021-09-14 17:07:39 +0000 | |
|---|---|---|
| committer | 2021-09-14 17:07:39 +0000 | |
| commit | dcaed9ba8ebdc467880bf06aec4359af34dfa875 (patch) | |
| tree | 53e9a8c77db457a49a636a5a061599ccd7685506 /libs/binder/RpcState.cpp | |
| parent | f4b83741a8170c7e21b6a3003cac76eed533d702 (diff) | |
| parent | d612489ad404f5f193b35a649790d7734f4a7314 (diff) | |
Merge changes I89e4de2e,I673d7a4c,Icfb454c2,I5924a82c am: a54c861843 am: d612489ad4
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1825953
Change-Id: Iefab3593ba5f4b4b4e7b3ba8de3490af7f369acf
Diffstat (limited to 'libs/binder/RpcState.cpp')
| -rw-r--r-- | libs/binder/RpcState.cpp | 7 |
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; } |