commit e203a154cf1ae3d9b57bd18f672fc0865195a218
author Luke Huang <huangluke@google.com> Fri Nov 23 11:47:28 2018 +0800
committer Luke Huang <huangluke@google.com> Mon Dec 03 03:25:26 2018 +0000
tree f78f2b156235a86672df718609bde202f8063be8
parent 13347dc7c3791ce1a14c8ebd1dcd4195aa5f813f

Use ParcelFileDescriptor instead of FileDescriptor in INetd.aidl

Stable aidl won't support FileDescriptor but ParcelFileDescriptor.
In order to migrate to stable aidl, replace all FileDescriptor in
INdetd.aidl.

Test: built, flashed, booted
      system/netd/tests/runtests.sh passes

Change-Id: I331626346959f127b4c1cb2ece33db37cb8dc550

server/NetdNativeService.h

diff --git a/server/NetdNativeService.h b/server/NetdNativeService.h
index c03853a..0160cf1 100644
--- a/server/NetdNativeService.h
+++ b/server/NetdNativeService.h
@@ -157,7 +157,7 @@
     binder::Status getMetricsReportingLevel(int *reportingLevel) override;
     binder::Status setMetricsReportingLevel(const int reportingLevel) override;
 
-    binder::Status ipSecSetEncapSocketOwner(const android::base::unique_fd& socket, int newUid);
+    binder::Status ipSecSetEncapSocketOwner(const os::ParcelFileDescriptor& socket, int newUid);
 
     binder::Status ipSecAllocateSpi(
             int32_t transformId,
@@ -182,16 +182,13 @@
                                                   int32_t spi, int32_t markValue, int32_t markMask,
                                                   int32_t interfaceId);
 
-    binder::Status ipSecApplyTransportModeTransform(
-            const android::base::unique_fd& socket,
-            int32_t transformId,
-            int32_t direction,
-            const std::string& sourceAddress,
-            const std::string& destinationAddress,
-            int32_t spi);
+    binder::Status ipSecApplyTransportModeTransform(const os::ParcelFileDescriptor& socket,
+                                                    int32_t transformId, int32_t direction,
+                                                    const std::string& sourceAddress,
+                                                    const std::string& destinationAddress,
+                                                    int32_t spi);
 
-    binder::Status ipSecRemoveTransportModeTransform(
-            const android::base::unique_fd& socket);
+    binder::Status ipSecRemoveTransportModeTransform(const os::ParcelFileDescriptor& socket);
 
     binder::Status ipSecAddSecurityPolicy(int32_t transformId, int32_t selAddrFamily,
                                           int32_t direction, const std::string& tmplSrcAddress,