commit 009fff60a4849be5d047794f5e563ca4fd84235a
author Treehugger Robot <treehugger-gerrit@google.com> Thu Nov 19 02:43:40 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Nov 19 02:43:40 2020 +0000
tree 1a7ae93a5634d9692f054604bb44f156991c2d2d
parent d37a1b47f0a39607c2033c331e198160798209c4
parent 4d9f91a1d58eb010d8a9ebfaee7c696f20fe1173

Merge "binder_ndk: use std::optional"

libs/binder/ndk/parcel.cpp

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);