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/Parcel.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/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 dce6f3bf70..75752525c6 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()); } } |