Skip to content

Commit ad4b07e

Browse files
Treehugger RobotGerrit Code Review
authored andcommitted
Merge "libbinder: closeFileDescrpitors private" into main
2 parents 34e3b05 + 68c19fd commit ad4b07e

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

libs/binder/include/binder/Parcel.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -637,9 +637,6 @@ class Parcel {
637637

638638
LIBBINDER_EXPORTED const flat_binder_object* readObject(bool nullMetaData) const;
639639

640-
// Explicitly close all file descriptors in the parcel.
641-
LIBBINDER_EXPORTED void closeFileDescriptors();
642-
643640
// Debugging: get metrics on current allocations.
644641
LIBBINDER_EXPORTED static size_t getGlobalAllocSize();
645642
LIBBINDER_EXPORTED static size_t getGlobalAllocCount();
@@ -652,6 +649,9 @@ class Parcel {
652649
LIBBINDER_EXPORTED void print(std::ostream& to, uint32_t flags = 0) const;
653650

654651
private:
652+
// Explicitly close all file descriptors in the parcel.
653+
void closeFileDescriptors();
654+
655655
// `objects` and `objectsSize` always 0 for RPC Parcels.
656656
typedef void (*release_func)(const uint8_t* data, size_t dataSize, const binder_size_t* objects,
657657
size_t objectsSize);

0 commit comments

Comments
 (0)