| commit | f895b7e005f16f6724d479ecad47ee4f5fb860f2 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Nov 19 04:13:35 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Nov 19 04:13:35 2020 +0000 |
| tree | a9ed1295ba8aea57ad6de415c0145ae4820bc37c | |
| parent | 8b6d10b11d87bdbbca41642fa3bbc6ea32d2d5a9 [diff] | |
| parent | 2cbe7670154ea17a0ce5cf1fe0c79e3b5e5286da [diff] |
Merge "binder_ndk: use std::optional" am: 009fff60a4 am: 00119bd10a am: 2cbe767015 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1501935 Change-Id: I53e80763ea0f8ea385880cd8cf486044b16b645d
diff --git a/libs/binder/ndk/parcel.cpp b/libs/binder/ndk/parcel.cpp index 3e3eda1..ec7c7d8 100644 --- a/libs/binder/ndk/parcel.cpp +++ b/libs/binder/ndk/parcel.cpp
@@ -261,7 +261,7 @@ } 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);