commit c3252ccf664ed31cb4d69c634f811cb81a0edff9
author Luke Huang <huangluke@google.com> Tue Oct 16 15:43:23 2018 +0800
committer Luke Huang <huangluke@google.com> Tue Oct 23 18:29:52 2018 +0900
tree 3d61946593a92d29113f67ff72470d037dc3f355
parent 189eb5020bcffa7a7e601edf2fecb98008acfa9e

Refine network-related commands porting

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

Change-Id: I7fac7b98a61da5820b374cbd221397a05aaa93d2

server/NetworkController.cpp

diff --git a/server/NetworkController.cpp b/server/NetworkController.cpp
index a55b10c..5f5b71f 100644
--- a/server/NetworkController.cpp
+++ b/server/NetworkController.cpp
@@ -30,6 +30,7 @@
 
 #include <android-base/strings.h>
 #include <netd_resolv/resolv.h>
+#include "android/net/INetd.h"
 
 #include "cutils/misc.h"
 
@@ -60,7 +61,7 @@
 const unsigned NetworkController::MAX_OEM_ID   = 50;
 const unsigned NetworkController::DUMMY_NET_ID = 51;
 // NetIds 52..98 are reserved for future use.
-const unsigned NetworkController::LOCAL_NET_ID = 99;
+const unsigned NetworkController::LOCAL_NET_ID = INetd::LOCAL_NET_ID;
 
 // All calls to methods here are made while holding a write lock on mRWLock.
 // They are mostly not called directly from this class, but from methods in PhysicalNetwork.cpp.