diff options
| author | 2020-11-19 03:26:08 +0000 | |
|---|---|---|
| committer | 2020-11-19 03:26:08 +0000 | |
| commit | 00119bd10aee9b37f8ed5bd35d10c52a3c0c97b1 (patch) | |
| tree | 1a7ae93a5634d9692f054604bb44f156991c2d2d | |
| parent | ff78481d4ec8791c986ee1d95b311e069603a31e (diff) | |
| parent | 009fff60a4849be5d047794f5e563ca4fd84235a (diff) | |
Merge "binder_ndk: use std::optional" am: 009fff60a4
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1501935
Change-Id: I67c48f8aa9e797e539e3c57aca3797e8fe43d91c
| -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); |