diff options
| author | 2021-09-14 16:30:42 +0000 | |
|---|---|---|
| committer | 2021-09-14 16:30:42 +0000 | |
| commit | a54c8618434a6ca4cf81c11054b507bf4d073680 (patch) | |
| tree | 9bf80ce5c7c05a81366ab1de46be6482d440346f /libs/binder/Parcel.cpp | |
| parent | a938daa1c6886710e3bb60383d3fe0117366a521 (diff) | |
| parent | 4f622fec33ea45e85eabf6f138e972598863c3e4 (diff) | |
Merge changes I89e4de2e,I673d7a4c,Icfb454c2,I5924a82c
* changes:
libbinder: RpcSession - hide RPC address format
libbinder: hide BpBinder::create(*) functions
binder_bpBinderFuzz: use valid BpBinder object
libbinder: shutdownAndWait based on # of in conns
Diffstat (limited to 'libs/binder/Parcel.cpp')
| -rw-r--r-- | libs/binder/Parcel.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp index 9147e23363..9f95167f86 100644 --- a/libs/binder/Parcel.cpp +++ b/libs/binder/Parcel.cpp @@ -237,7 +237,7 @@ status_t Parcel::flattenBinder(const sp<IBinder>& binder) { return INVALID_OPERATION; } } - const int32_t handle = proxy ? proxy->getPrivateAccessorForId().binderHandle() : 0; + const int32_t handle = proxy ? proxy->getPrivateAccessor().binderHandle() : 0; obj.hdr.type = BINDER_TYPE_HANDLE; obj.binder = 0; /* Don't pass uninitialized stack data to a remote process */ obj.handle = handle; @@ -572,7 +572,7 @@ void Parcel::markForBinder(const sp<IBinder>& binder) { LOG_ALWAYS_FATAL_IF(mData != nullptr, "format must be set before data is written"); if (binder && binder->remoteBinder() && binder->remoteBinder()->isRpcBinder()) { - markForRpc(binder->remoteBinder()->getPrivateAccessorForId().rpcSession()); + markForRpc(binder->remoteBinder()->getPrivateAccessor().rpcSession()); } } |