commit 2cf1995d3d1cdca8e0ba2d8fab9a322c4096f809
author Christopher Wiley <wiley@google.com> Mon Apr 11 11:09:37 2016 -0700
committer Christopher Wiley <wiley@google.com> Mon Apr 25 08:44:37 2016 -0700
tree 87f1c489dd05b9f05d45a94501567c07bb6a0fbf
parent 33dcaf9b52649785bff0c56b48f84a8218354888

libbinder: Replace ScopedFd with base::unique_fd

unique_fd is a more canonical construct going forward.

Bug: 27804373
Test: checkbuilds pass on aosp x86_64-eng

Change-Id: I53eca34c0f4fd00be770a6898ff06ec2e98b9c8e

include/binder/Parcel.h

diff --git a/include/binder/Parcel.h b/include/binder/Parcel.h
index 7ca5d8b..97a3376 100644
--- a/include/binder/Parcel.h
+++ b/include/binder/Parcel.h
@@ -22,7 +22,6 @@
 
 #include <android-base/unique_fd.h>
 #include <cutils/native_handle.h>
-#include <nativehelper/ScopedFd.h>
 #include <utils/Errors.h>
 #include <utils/RefBase.h>
 #include <utils/String16.h>
@@ -187,14 +186,14 @@
     // semantics of the smart file descriptor. A new descriptor will be
     // created, and will be closed when the parcel is destroyed.
     status_t            writeUniqueFileDescriptor(
-                            const ScopedFd& fd);
+                            const base::unique_fd& fd);
 
     // Place a vector of file desciptors into the parcel. Each descriptor is
     // dup'd as in writeDupFileDescriptor
     status_t            writeUniqueFileDescriptorVector(
-                            const std::unique_ptr<std::vector<ScopedFd>>& val);
+                            const std::unique_ptr<std::vector<base::unique_fd>>& val);
     status_t            writeUniqueFileDescriptorVector(
-                            const std::vector<ScopedFd>& val);
+                            const std::vector<base::unique_fd>& val);
 
     // Writes a blob to the parcel.
     // If the blob is small, then it is stored in-place, otherwise it is
@@ -325,14 +324,14 @@
 
     // Retrieve a smart file descriptor from the parcel.
     status_t            readUniqueFileDescriptor(
-                            ScopedFd* val) const;
+                            base::unique_fd* val) const;
 
 
     // Retrieve a vector of smart file descriptors from the parcel.
     status_t            readUniqueFileDescriptorVector(
-                            std::unique_ptr<std::vector<ScopedFd>>* val) const;
+                            std::unique_ptr<std::vector<base::unique_fd>>* val) const;
     status_t            readUniqueFileDescriptorVector(
-                            std::vector<ScopedFd>* val) const;
+                            std::vector<base::unique_fd>* val) const;
 
     // Reads a blob from the parcel.
     // The caller should call release() on the blob after reading its contents.