commit 94658ac61e1c377251eb51f4e1c22e5140357fdb
author Luke Huang <huangluke@google.com> Thu Oct 18 19:35:12 2018 +0900
committer Luke Huang <huangluke@google.com> Thu Oct 25 13:32:55 2018 +0900
tree b0b8265a6b888a9db5f43dc63d87fe0623d06b47
parent 25b62a77695643ac232002a5a98f8f2a349bde11

Refactor UidRange by using stable aidl structure

Use stable aidl generated structure instead of UidRange

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

Change-Id: I136afcff167eac7d3c4774b9e60f607e086488bf

server/NetdNativeService.h

diff --git a/server/NetdNativeService.h b/server/NetdNativeService.h
index 77179cd..09b16a1 100644
--- a/server/NetdNativeService.h
+++ b/server/NetdNativeService.h
@@ -23,7 +23,6 @@
 #include <netdutils/Log.h>
 
 #include "android/net/BnNetd.h"
-#include "android/net/UidRange.h"
 
 namespace android {
 namespace net {
@@ -67,12 +66,12 @@
     binder::Status networkAddInterface(int32_t netId, const std::string& iface) override;
     binder::Status networkRemoveInterface(int32_t netId, const std::string& iface) override;
 
-    binder::Status networkAddUidRanges(int32_t netId, const std::vector<UidRange>& uids)
-            override;
-    binder::Status networkRemoveUidRanges(int32_t netId, const std::vector<UidRange>& uids)
-            override;
-    binder::Status networkRejectNonSecureVpn(bool enable, const std::vector<UidRange>& uids)
-            override;
+    binder::Status networkAddUidRanges(int32_t netId,
+                                       const std::vector<UidRangeParcel>& uids) override;
+    binder::Status networkRemoveUidRanges(int32_t netId,
+                                          const std::vector<UidRangeParcel>& uids) override;
+    binder::Status networkRejectNonSecureVpn(bool enable,
+                                             const std::vector<UidRangeParcel>& uids) override;
     binder::Status networkAddRoute(int32_t netId, const std::string& ifName,
                                    const std::string& destination,
                                    const std::string& nextHop) override;
@@ -98,8 +97,8 @@
     binder::Status networkCanProtect(int32_t uid, bool* ret) override;
 
     // SOCK_DIAG commands.
-    binder::Status socketDestroy(const std::vector<UidRange>& uids,
-            const std::vector<int32_t>& skipUids) override;
+    binder::Status socketDestroy(const std::vector<UidRangeParcel>& uids,
+                                 const std::vector<int32_t>& skipUids) override;
 
     // Resolver commands.
     binder::Status setResolverConfiguration(int32_t netId, const std::vector<std::string>& servers,