diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2017-02-13 18:29:00 +0900 |
|---|---|---|
| committer | Lorenzo Colitti <lorenzo@google.com> | 2017-02-14 12:46:43 +0900 |
| commit | 7035f228d17e925116b1b64a7c917b3196ab8818 (patch) | |
| tree | 9b9885872f05379d891a070e84b09b45c0afd37d /server/NetworkController.cpp | |
| parent | 1e1253aaaf196a76cfdd0bc5e94e6ad2ca4e7b25 (diff) | |
| download | platform_system_netd-7035f228d17e925116b1b64a7c917b3196ab8818.tar.gz platform_system_netd-7035f228d17e925116b1b64a7c917b3196ab8818.tar.bz2 platform_system_netd-7035f228d17e925116b1b64a7c917b3196ab8818.zip | |
Put most of netd into the android::net namespace.
Test: netd_{unit,integration}_test pass
Test: bullhead builds, boots
Bug: 34873832
Change-Id: I0a252328041b342f9c03cd08c11a69d452b045b3
Diffstat (limited to 'server/NetworkController.cpp')
| -rw-r--r-- | server/NetworkController.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/server/NetworkController.cpp b/server/NetworkController.cpp index c891391d6..8e4c69dfd 100644 --- a/server/NetworkController.cpp +++ b/server/NetworkController.cpp @@ -47,6 +47,9 @@ #include "RouteController.h" #include "VirtualNetwork.h" +namespace android { +namespace net { + namespace { // Keep these in sync with ConnectivityService.java. @@ -666,3 +669,6 @@ int NetworkController::modifyFallthroughLocked(unsigned vpnNetId, bool add) { } return 0; } + +} // namespace net +} // namespace android |