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

Commit 8969522c authored by T.J. Mercier's avatar T.J. Mercier Committed by Automerger Merge Worker
Browse files

Merge "Do not set FLAT_BINDER_FLAG_* on object of type BINDER_TYPE_FD" am: cbb975dc 

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



Change-Id: Ie4b040c561d34ec4f9542939d8952f6ef32602d8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0ac8bcce cbb975dc

libs/binder/Parcel.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1475,7 +1475,7 @@ status_t Parcel::writeFileDescriptor(int fd, bool takeOwnership) { 
#ifdef BINDER_WITH_KERNEL_IPC

    flat_binder_object obj;

    obj.hdr.type = BINDER_TYPE_FD;

    obj.flags = 0x7f | FLAT_BINDER_FLAG_ACCEPTS_FDS;

    obj.flags = 0;

    obj.binder = 0; /* Don't pass uninitialized stack data to a remote process */

    obj.handle = fd;

    obj.cookie = takeOwnership ? 1 : 0;