commit 7035f228d17e925116b1b64a7c917b3196ab8818
author Lorenzo Colitti <lorenzo@google.com> Mon Feb 13 18:29:00 2017 +0900
committer Lorenzo Colitti <lorenzo@google.com> Tue Feb 14 12:46:43 2017 +0900
tree 9b9885872f05379d891a070e84b09b45c0afd37d
parent 1e1253aaaf196a76cfdd0bc5e94e6ad2ca4e7b25

Put most of netd into the android::net namespace.

Test: netd_{unit,integration}_test pass
Test: bullhead builds, boots
Bug: 34873832
Change-Id: I0a252328041b342f9c03cd08c11a69d452b045b3

server/FwmarkServer.cpp

diff --git a/server/FwmarkServer.cpp b/server/FwmarkServer.cpp
index 38a116d..a9a18c5 100644
--- a/server/FwmarkServer.cpp
+++ b/server/FwmarkServer.cpp
@@ -30,6 +30,9 @@
 using android::String16;
 using android::net::metrics::INetdEventListener;
 
+namespace android {
+namespace net {
+
 FwmarkServer::FwmarkServer(NetworkController* networkController, EventReporter* eventReporter) :
         SocketListener("fwmarkd", true), mNetworkController(networkController),
         mEventReporter(eventReporter) {
@@ -252,3 +255,6 @@
 
     return 0;
 }
+
+}  // namespace net
+}  // namespace android