Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe2b1189 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "libbinder: remove obsolete getBlobAshmemSize" into main am: 1656f6ba am: 03c58c3e 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3434384



Change-Id: I6419d7c5698c36b4087d80c607212f677561ff7c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cc0ce1cd 03c58c3e

libs/binder/Parcel.cpp

+0 −8
Original line number Diff line number Diff line
@@ -3389,14 +3389,6 @@ void Parcel::scanForFds() const { 
}



#ifdef BINDER_WITH_KERNEL_IPC

size_t Parcel::getBlobAshmemSize() const

{

    // This used to return the size of all blobs that were written to ashmem, now we're returning

    // the ashmem currently referenced by this Parcel, which should be equivalent.

    // TODO(b/202029388): Remove method once ABI can be changed.

    return getOpenAshmemSize();

}



size_t Parcel::getOpenAshmemSize() const

{

    auto* kernelFields = maybeKernelFields();

libs/binder/include/binder/Parcel.h

+5 −4
Original line number Diff line number Diff line
@@ -1488,14 +1488,15 @@ public: 
     * Note: for historical reasons, this does not include ashmem memory which

     * is referenced by this Parcel, but which this parcel doesn't own (e.g.

     * writeFileDescriptor is called without 'takeOwnership' true).

     *

     * WARNING: you should not use this, but rather, unparcel, and inspect

     * each FD independently. This counts ashmem size, but there may be

     * other resources used for non-ashmem FDs, such as other types of

     * shared memory, files, etc..

     */

    LIBBINDER_EXPORTED size_t getOpenAshmemSize() const;



private:

    // TODO(b/202029388): Remove 'getBlobAshmemSize' once no prebuilts reference

    // this

    LIBBINDER_EXPORTED size_t getBlobAshmemSize() const;



    // Needed so that we can save object metadata to the disk

    friend class android::binder::debug::RecordedTransaction;

};