| commit | a2aae91cbadbfea69b010fa09053e08596449a70 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Nov 19 05:14:00 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Nov 19 05:14:00 2020 +0000 |
| tree | cb8fe35a8c04d7700d28ce7614378c517bf6c7d3 | |
| parent | 158a2890bfb27b69f210aa3944441ca5d4b8ff31 [diff] | |
| parent | f895b7e005f16f6724d479ecad47ee4f5fb860f2 [diff] |
Merge "binder_ndk: use std::optional" am: 009fff60a4 am: 00119bd10a am: 2cbe767015 am: f895b7e005 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1501935 Change-Id: I1fc4b8eff590aee869432b2f30036aa7acd1f7a3
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);