Skip to content

Commit 4ce0bd9

Browse files
Treehugger Robotandroid-build-merge-worker-robot
authored andcommitted
Merge "libbinder: make writeObject private" into main am: 5ee04a1
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3434386 Change-Id: I898208274d730e4ace041ba99db851584e5396c2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2 parents 5addbe9 + 5ee04a1 commit 4ce0bd9

1 file changed

Lines changed: 1 addition & 2 deletions

File tree

libs/binder/include/binder/Parcel.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -401,8 +401,6 @@ class Parcel {
401401
// as long as it keeps a dup of the blob file descriptor handy for later.
402402
LIBBINDER_EXPORTED status_t writeDupImmutableBlobFileDescriptor(int fd);
403403

404-
LIBBINDER_EXPORTED status_t writeObject(const flat_binder_object& val, bool nullMetaData);
405-
406404
// Like Parcel.java's writeNoException(). Just writes a zero int32.
407405
// Currently the native implementation doesn't do any of the StrictMode
408406
// stack gathering and serialization that the Java implementation does.
@@ -679,6 +677,7 @@ class Parcel {
679677
// Set the capacity to `desired`, truncating the Parcel if necessary.
680678
status_t continueWrite(size_t desired);
681679
status_t truncateRpcObjects(size_t newObjectsSize);
680+
status_t writeObject(const flat_binder_object& val, bool nullMetaData);
682681
status_t writePointer(uintptr_t val);
683682
status_t readPointer(uintptr_t *pArg) const;
684683
uintptr_t readPointer() const;

0 commit comments

Comments
 (0)