commit ad4b07e6394a1f945d66f9f0b969ea7306ba84b7
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Oct 02 02:31:36 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 02 02:31:36 2024 +0000
tree a649909c60668f5495a21e4d13509909ff9589b1
parent 34e3b054817009e523f13c24db36256940a94e20
parent 68c19fd3e8ee5350b6c3ca195265627b4e650677

Merge "libbinder: closeFileDescrpitors private" into main

libs/binder/include/binder/Parcel.h

diff --git a/libs/binder/include/binder/Parcel.h b/libs/binder/include/binder/Parcel.h
index e2b23be..c394ac7 100644
--- a/libs/binder/include/binder/Parcel.h
+++ b/libs/binder/include/binder/Parcel.h
@@ -637,9 +637,6 @@
 
     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 @@
     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);