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

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

Merge "libbinder: closeFileDescrpitors private" into main am: ad4b07e6 

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



Change-Id: If49a2ebba9be04cbeb2aee44ef2b88b581caa0e8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f7736b70 ad4b07e6

libs/binder/include/binder/Parcel.h

+3 −3
Original line number Original line Diff line number Diff line
@@ -637,9 +637,6 @@ public: 




    LIBBINDER_EXPORTED const flat_binder_object* readObject(bool nullMetaData) const;

    LIBBINDER_EXPORTED const flat_binder_object* readObject(bool nullMetaData) const;





    // Explicitly close all file descriptors in the parcel.

    LIBBINDER_EXPORTED void closeFileDescriptors();



    // Debugging: get metrics on current allocations.

    // Debugging: get metrics on current allocations.

    LIBBINDER_EXPORTED static size_t getGlobalAllocSize();

    LIBBINDER_EXPORTED static size_t getGlobalAllocSize();

    LIBBINDER_EXPORTED static size_t getGlobalAllocCount();

    LIBBINDER_EXPORTED static size_t getGlobalAllocCount();
@@ -652,6 +649,9 @@ public: 
    LIBBINDER_EXPORTED void print(std::ostream& to, uint32_t flags = 0) const;

    LIBBINDER_EXPORTED void print(std::ostream& to, uint32_t flags = 0) const;





private:

private:

    // Explicitly close all file descriptors in the parcel.

    void closeFileDescriptors();



    // `objects` and `objectsSize` always 0 for RPC Parcels.

    // `objects` and `objectsSize` always 0 for RPC Parcels.

    typedef void (*release_func)(const uint8_t* data, size_t dataSize, const binder_size_t* objects,

    typedef void (*release_func)(const uint8_t* data, size_t dataSize, const binder_size_t* objects,

                                 size_t objectsSize);

                                 size_t objectsSize);