Skip to content

Commit 3494c4f

Browse files
author
Steven Moreland
committed
libbinder: remove obsolete getBlobAshmemSize
This used to be referenced by some prebuilts, but should be able to remove now. Bug: N/A Test: N/A Change-Id: I77306c123bf3535d7a0cb7857e1e1d99d3c1c7d4
1 parent 38a4ab9 commit 3494c4f

2 files changed

Lines changed: 5 additions & 12 deletions

File tree

libs/binder/Parcel.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3287,14 +3287,6 @@ void Parcel::scanForFds() const {
32873287
}
32883288

32893289
#ifdef BINDER_WITH_KERNEL_IPC
3290-
size_t Parcel::getBlobAshmemSize() const
3291-
{
3292-
// This used to return the size of all blobs that were written to ashmem, now we're returning
3293-
// the ashmem currently referenced by this Parcel, which should be equivalent.
3294-
// TODO(b/202029388): Remove method once ABI can be changed.
3295-
return getOpenAshmemSize();
3296-
}
3297-
32983290
size_t Parcel::getOpenAshmemSize() const
32993291
{
33003292
auto* kernelFields = maybeKernelFields();

libs/binder/include/binder/Parcel.h

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1479,14 +1479,15 @@ class Parcel {
14791479
* Note: for historical reasons, this does not include ashmem memory which
14801480
* is referenced by this Parcel, but which this parcel doesn't own (e.g.
14811481
* writeFileDescriptor is called without 'takeOwnership' true).
1482+
*
1483+
* WARNING: you should not use this, but rather, unparcel, and inspect
1484+
* each FD independently. This counts ashmem size, but there may be
1485+
* other resources used for non-ashmem FDs, such as other types of
1486+
* shared memory, files, etc..
14821487
*/
14831488
LIBBINDER_EXPORTED size_t getOpenAshmemSize() const;
14841489

14851490
private:
1486-
// TODO(b/202029388): Remove 'getBlobAshmemSize' once no prebuilts reference
1487-
// this
1488-
LIBBINDER_EXPORTED size_t getBlobAshmemSize() const;
1489-
14901491
// Needed so that we can save object metadata to the disk
14911492
friend class android::binder::debug::RecordedTransaction;
14921493
};

0 commit comments

Comments
 (0)