Put most of netd into the android::net namespace.
Test: netd_{unit,integration}_test pass
Test: bullhead builds, boots
Bug: 34873832
Change-Id: I0a252328041b342f9c03cd08c11a69d452b045b3
diff --git a/server/RouteController.cpp b/server/RouteController.cpp
index a50dab3..f61a5ef 100644
--- a/server/RouteController.cpp
+++ b/server/RouteController.cpp
@@ -27,9 +27,9 @@
#include <map>
+#include "DummyNetwork.h"
#include "Fwmark.h"
#include "UidRanges.h"
-#include "DummyNetwork.h"
#include "android-base/file.h"
#define LOG_TAG "Netd"
@@ -41,6 +41,9 @@
using android::base::WriteStringToFile;
using android::net::UidRange;
+namespace android {
+namespace net {
+
namespace {
// BEGIN CONSTANTS --------------------------------------------------------------------------------
@@ -1164,3 +1167,6 @@
Permission permission) {
return modifyVpnFallthroughRule(RTM_DELRULE, vpnNetId, physicalInterface, permission);
}
+
+} // namespace net
+} // namespace android