commit cfd04b232b89f9c98d421ff1cc7343a57f6954d3
author Luke Huang <huangluke@google.com> Mon Mar 18 15:53:21 2019 +0800
committer Luke Huang <huangluke@google.com> Wed Apr 24 18:31:45 2019 +0800
tree 45ebc95486b0ae05dbf90cf60b66149f08236721
parent 7720e4a569eacecce3d8c02ecdc023907e6c4c87

NDC migration to binder ver.

Make ndc communicating with netd via binder

Bug: 65862741
Test: built, flashed, booted
      system/netd/tests/runtests.sh pass
      manual test ndc commands
Change-Id: I9edfda61d8c3a4d7b404a428e7dbb4d08eff62a9

server/NetworkController.h

diff --git a/server/NetworkController.h b/server/NetworkController.h
index d765ae7..0522b6d 100644
--- a/server/NetworkController.h
+++ b/server/NetworkController.h
@@ -17,12 +17,13 @@
 #ifndef NETD_SERVER_NETWORK_CONTROLLER_H
 #define NETD_SERVER_NETWORK_CONTROLLER_H
 
-
 #include <android-base/thread_annotations.h>
 #include <android/multinetwork.h>
 
+
 #include "NetdConstants.h"
 #include "Permission.h"
+#include "android/net/INetd.h"
 #include "netdutils/DumpWriter.h"
 
 #include <sys/types.h>
@@ -83,10 +84,11 @@
  */
 class NetworkController {
 public:
-    static const unsigned MIN_OEM_ID;
-    static const unsigned MAX_OEM_ID;
-    static const unsigned LOCAL_NET_ID;
-    static const unsigned DUMMY_NET_ID;
+    // NetIds 52..98 are reserved for future use.
+    static const unsigned MIN_OEM_ID = 1;
+    static const unsigned MAX_OEM_ID = 50;
+    static const unsigned LOCAL_NET_ID = INetd::LOCAL_NET_ID;
+    static const unsigned DUMMY_NET_ID = 51;
 
     NetworkController();