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/XfrmController.h

diff --git a/server/XfrmController.h b/server/XfrmController.h
index bba84e2..cc12c38 100644
--- a/server/XfrmController.h
+++ b/server/XfrmController.h
@@ -141,8 +141,7 @@
 
     static netdutils::Status Init();
 
-    static netdutils::Status ipSecSetEncapSocketOwner(const android::base::unique_fd& socket,
-                                                      int newUid, uid_t callerUid);
+    static netdutils::Status ipSecSetEncapSocketOwner(int socketFd, int newUid, uid_t callerUid);
 
     static netdutils::Status ipSecAllocateSpi(int32_t transformId, const std::string& localAddress,
                                               const std::string& remoteAddress, int32_t inSpi,
@@ -165,13 +164,13 @@
                                                             int32_t markMask,
                                                             int32_t xfrmInterfaceId);
 
-    static netdutils::Status
-    ipSecApplyTransportModeTransform(const android::base::unique_fd& socket, int32_t transformId,
-                                     int32_t direction, const std::string& localAddress,
-                                     const std::string& remoteAddress, int32_t spi);
+    static netdutils::Status ipSecApplyTransportModeTransform(int socketFd, int32_t transformId,
+                                                              int32_t direction,
+                                                              const std::string& localAddress,
+                                                              const std::string& remoteAddress,
+                                                              int32_t spi);
 
-    static netdutils::Status
-    ipSecRemoveTransportModeTransform(const android::base::unique_fd& socket);
+    static netdutils::Status ipSecRemoveTransportModeTransform(int socketFd);
 
     static netdutils::Status ipSecAddSecurityPolicy(int32_t transformId, int32_t selAddrFamily,
                                                     int32_t direction,