diff options
| author | 2020-11-19 03:50:15 +0000 | |
|---|---|---|
| committer | 2020-11-19 03:50:15 +0000 | |
| commit | 2cbe7670154ea17a0ce5cf1fe0c79e3b5e5286da (patch) | |
| tree | 0e3f7f3edbf0543edeea14a5f22054e718d72a62 | |
| parent | 65aa3cd17423e9ad5fc1c09aa5874d036008fbce (diff) | |
| parent | 00119bd10aee9b37f8ed5bd35d10c52a3c0c97b1 (diff) | |
Merge "binder_ndk: use std::optional" am: 009fff60a4 am: 00119bd10a
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1501935
Change-Id: I4d35ec7dd878240991250ccdea9b9f92388fb8d9
| -rw-r--r-- | libs/binder/ndk/parcel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/binder/ndk/parcel.cpp b/libs/binder/ndk/parcel.cpp index 3e3eda11aa..ec7c7d8c88 100644 --- a/libs/binder/ndk/parcel.cpp +++ b/libs/binder/ndk/parcel.cpp @@ -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); |