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

Commit f895b7e0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "binder_ndk: use std::optional" am: 009fff60 am: 00119bd1 am: 2cbe7670 

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

Change-Id: I53e80763ea0f8ea385880cd8cf486044b16b645d
parents 8b6d10b1 2cbe7670

libs/binder/ndk/parcel.cpp

+1 −1
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ binder_status_t AParcel_writeParcelFileDescriptor(AParcel* parcel, int fd) { 
}



binder_status_t AParcel_readParcelFileDescriptor(const AParcel* parcel, int* fd) {

    std::unique_ptr<ParcelFileDescriptor> parcelFd;

    std::optional<ParcelFileDescriptor> parcelFd;



    status_t status = parcel->get()->readParcelable(&parcelFd);

    if (status != STATUS_OK) return PruneStatusT(status);