diff options
| author | 2020-11-18 13:24:16 +0900 | |
|---|---|---|
| committer | 2020-11-18 15:10:02 +0900 | |
| commit | 4d9f91a1d58eb010d8a9ebfaee7c696f20fe1173 (patch) | |
| tree | 2ec4249c571bf632825251ce3cccac2643c6f92d | |
| parent | 5b4e68d756c68b279fe89d47f29b762e3b45267c (diff) | |
binder_ndk: use std::optional
Since Android R, Parcel provides read/write methods for "@nullable"
values using std::optional.
Bug: 149784838
Test: m
Test: CtsNdkBinderTestCases
Change-Id: If8f3e4c658766ec197471c0994b0611cdb076944
| -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); |