commit 637113c267bd541aebdee1fc9e840b39086748f5
author Steven Moreland <smoreland@google.com> Thu Feb 20 17:13:08 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Feb 20 17:13:08 2020 +0000
tree 4e068763dccfc3af536d3df5312baf9dedcc844b
parent 835546fa3d48cdff6d1cd95c58ba8078411b7463
parent 073c9c1911f071e9091695286a60c491cd54bd35

Merge "libbinder_ndk: don't borrow fd into unique_fd"

libs/binder/ndk/parcel.cpp

diff --git a/libs/binder/ndk/parcel.cpp b/libs/binder/ndk/parcel.cpp
index 703ceae..c33c44f 100644
--- a/libs/binder/ndk/parcel.cpp
+++ b/libs/binder/ndk/parcel.cpp
@@ -247,15 +247,12 @@
         if (fd != -1) {
             return STATUS_UNKNOWN_ERROR;
         }
-        return parcel->get()->writeInt32(0);  // null
+        return PruneStatusT(parcel->get()->writeInt32(0));  // null
     }
+    status_t status = parcel->get()->writeInt32(1);  // not-null
+    if (status != STATUS_OK) return PruneStatusT(status);
 
-    ParcelFileDescriptor parcelFd = ParcelFileDescriptor(unique_fd(fd));
-    status_t status = parcel->get()->writeParcelable(parcelFd);
-
-    // ownership is retained by caller
-    (void)parcelFd.release().release();
-
+    status = parcel->get()->writeDupParcelFileDescriptor(fd);
     return PruneStatusT(status);
 }