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

Commit 637113c2 authored by Steven Moreland's avatar Steven Moreland Committed by Gerrit Code Review
Browse files

Merge "libbinder_ndk: don't borrow fd into unique_fd"

parents 835546fa 073c9c19
Loading
Loading
Loading
Loading
+4 −7
Original line number Diff line number Diff line
@@ -247,15 +247,12 @@ binder_status_t AParcel_writeParcelFileDescriptor(AParcel* parcel, int fd) {
        if (fd != -1) {
            return STATUS_UNKNOWN_ERROR;
        }
        return parcel->get()->writeInt32(0);  // null
        return PruneStatusT(parcel->get()->writeInt32(0));  // null
    }
    status_t status = parcel->get()->writeInt32(1);  // not-null
    if (status != STATUS_OK) return PruneStatusT(status);

    ParcelFileDescriptor parcelFd = ParcelFileDescriptor(unique_fd(fd));
    status_t status = parcel->get()->writeParcelable(parcelFd);

    // ownership is retained by caller
    (void)parcelFd.release().release();

    status = parcel->get()->writeDupParcelFileDescriptor(fd);
    return PruneStatusT(status);
}