diff options
| author | 2020-11-13 17:19:37 +0000 | |
|---|---|---|
| committer | 2020-11-13 17:19:37 +0000 | |
| commit | 99d7fa9eecec22c3a4c4aee7c11f1c5bacfc7499 (patch) | |
| tree | 651b610f15dcc43b2085ee3b1a26dc6631b3d263 /libs/binder/IPCThreadState.cpp | |
| parent | 8ea28c9584e2ebc5c6d6c4229a3c2e905266f96c (diff) | |
| parent | 1ba794585d6ae1e283c422b6bfa2b592446c6488 (diff) | |
Merge "libbinder: Parcel, remove mOwnerCookie" am: 1ba794585d
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1496311
Change-Id: Ib6cc2668483259383079393b00122e83de772040
Diffstat (limited to 'libs/binder/IPCThreadState.cpp')
| -rw-r--r-- | libs/binder/IPCThreadState.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libs/binder/IPCThreadState.cpp b/libs/binder/IPCThreadState.cpp index a3a2f871e6..28ce935be1 100644 --- a/libs/binder/IPCThreadState.cpp +++ b/libs/binder/IPCThreadState.cpp @@ -895,21 +895,21 @@ status_t IPCThreadState::waitForResponse(Parcel *reply, status_t *acquireResult) tr.data_size, reinterpret_cast<const binder_size_t*>(tr.data.ptr.offsets), tr.offsets_size/sizeof(binder_size_t), - freeBuffer, this); + freeBuffer); } else { err = *reinterpret_cast<const status_t*>(tr.data.ptr.buffer); freeBuffer(nullptr, reinterpret_cast<const uint8_t*>(tr.data.ptr.buffer), tr.data_size, reinterpret_cast<const binder_size_t*>(tr.data.ptr.offsets), - tr.offsets_size/sizeof(binder_size_t), this); + tr.offsets_size/sizeof(binder_size_t)); } } else { freeBuffer(nullptr, reinterpret_cast<const uint8_t*>(tr.data.ptr.buffer), tr.data_size, reinterpret_cast<const binder_size_t*>(tr.data.ptr.offsets), - tr.offsets_size/sizeof(binder_size_t), this); + tr.offsets_size/sizeof(binder_size_t)); continue; } } @@ -1183,7 +1183,7 @@ status_t IPCThreadState::executeCommand(int32_t cmd) reinterpret_cast<const uint8_t*>(tr.data.ptr.buffer), tr.data_size, reinterpret_cast<const binder_size_t*>(tr.data.ptr.offsets), - tr.offsets_size/sizeof(binder_size_t), freeBuffer, this); + tr.offsets_size/sizeof(binder_size_t), freeBuffer); const void* origServingStackPointer = mServingStackPointer; mServingStackPointer = &origServingStackPointer; // anything on the stack @@ -1370,7 +1370,7 @@ status_t IPCThreadState::freeze(pid_t pid, bool enable, uint32_t timeout_ms) { void IPCThreadState::freeBuffer(Parcel* parcel, const uint8_t* data, size_t /*dataSize*/, const binder_size_t* /*objects*/, - size_t /*objectsSize*/, void* /*cookie*/) + size_t /*objectsSize*/) { //ALOGI("Freeing parcel %p", &parcel); IF_LOG_COMMANDS() { |