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

Commit e3768ad7 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "libbinder_ndk: don't borrow fd into unique_fd" am: 637113c2 am: ba7a3159 

Change-Id: I36f95c6a8e40b2535df88ac044116b74150e2279
parents 625595bf ba7a3159

libs/binder/ndk/parcel.cpp

+4 −7
Original line number Original line Diff line number Diff line
@@ -247,15 +247,12 @@ binder_status_t AParcel_writeParcelFileDescriptor(AParcel* parcel, int fd) { 
        if (fd != -1) {

        if (fd != -1) {

            return STATUS_UNKNOWN_ERROR;

            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 = parcel->get()->writeDupParcelFileDescriptor(fd);

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



    // ownership is retained by caller

    (void)parcelFd.release().release();



    return PruneStatusT(status);

    return PruneStatusT(status);

}

}