Wrap InterfaceController into the android::net namespace
No functionality changes, this is a cleanup.
Test: m netd_unit_test
Change-Id: I5c6667051b7b4b17171e6dcc6883f17db08eaa23
diff --git a/server/InterfaceController.cpp b/server/InterfaceController.cpp
index 4c35085..7006fee 100644
--- a/server/InterfaceController.cpp
+++ b/server/InterfaceController.cpp
@@ -192,6 +192,9 @@
} // namespace
+namespace android {
+namespace net {
+
android::netdutils::Status InterfaceController::enableStablePrivacyAddresses(
const std::string& iface,
const GetPropertyFn& getProperty,
@@ -439,3 +442,6 @@
}
return ifacePairs;
}
+
+} // namespace net
+} // namespace android
diff --git a/server/InterfaceController.h b/server/InterfaceController.h
index 45ff878..4c5b27f 100644
--- a/server/InterfaceController.h
+++ b/server/InterfaceController.h
@@ -23,12 +23,10 @@
#include <netdutils/Status.h>
#include <netdutils/StatusOr.h>
-// TODO: move InterfaceController into android::net namespace.
namespace android {
namespace net {
+
class StablePrivacyTest;
-} // namespace net
-} // namespace android
class InterfaceController {
public:
@@ -83,4 +81,7 @@
~InterfaceController() = delete;
};
+} // namespace net
+} // namespace android
+
#endif
diff --git a/server/TetherController.cpp b/server/TetherController.cpp
index c086465..84bab0a 100644
--- a/server/TetherController.cpp
+++ b/server/TetherController.cpp
@@ -49,6 +49,9 @@
#include "ResponseCode.h"
#include "TetherController.h"
+namespace android {
+namespace net {
+
using android::base::Join;
using android::base::StringAppendF;
using android::base::StringPrintf;
@@ -112,9 +115,6 @@
} // namespace
-namespace android {
-namespace net {
-
auto TetherController::iptablesRestoreFunction = execIptablesRestoreWithOutput;
const int MAX_IPT_OUTPUT_LINE_LEN = 256;