diff options
| author | 2024-10-02 03:15:16 +0000 | |
|---|---|---|
| committer | 2024-10-02 03:15:16 +0000 | |
| commit | 8072f42c35dc614749f9696762555b66696599e8 (patch) | |
| tree | 2168e4430581747c865f66774a4ad189eb022476 | |
| parent | 8a30ed11c7cd925d22d7531189f064759f38586c (diff) | |
| parent | f8a3841530bddb03c26f8dfa89aaa1b051ce92ac (diff) | |
Merge "libbinder: closeFileDescrpitors private" into main am: ad4b07e639 am: f8a3841530
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3288805
Change-Id: Ica6e457d8ec114c1a5ed8c9c935b861c7ab48938
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libs/binder/include/binder/Parcel.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/binder/include/binder/Parcel.h b/libs/binder/include/binder/Parcel.h index e2b23be58f..c394ac70c8 100644 --- a/libs/binder/include/binder/Parcel.h +++ b/libs/binder/include/binder/Parcel.h @@ -637,9 +637,6 @@ public: 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. LIBBINDER_EXPORTED static size_t getGlobalAllocSize(); LIBBINDER_EXPORTED static size_t getGlobalAllocCount(); @@ -652,6 +649,9 @@ public: LIBBINDER_EXPORTED void print(std::ostream& to, uint32_t flags = 0) const; private: + // Explicitly close all file descriptors in the parcel. + void closeFileDescriptors(); + // `objects` and `objectsSize` always 0 for RPC Parcels. typedef void (*release_func)(const uint8_t* data, size_t dataSize, const binder_size_t* objects, size_t objectsSize); |