diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-02-15 06:05:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-02-15 06:05:49 +0000 |
| commit | 4142d02b27793c9effb18ceb4c028e3ccaff7ebf (patch) | |
| tree | 0952fcd2e0e1ec060903bc72b60207c5387148db /server/InterfaceController.cpp | |
| parent | 1e1253aaaf196a76cfdd0bc5e94e6ad2ca4e7b25 (diff) | |
| parent | 220ca739ad863fcd40c9ca107f6e0f68f7a45d14 (diff) | |
Merge changes Ib327e8a3,I195dd388,I4875ac7f,I8479a8c2,Ia6fcde63, ...
* changes:
Don't complain when deleting non-existent tethering rules.
Don't call NetlinkCallbacks with nullptr on NLMSG_DONE.
Use netlink code to flush rules.
Add a generic netlink dump function and use it in SockDiag.
Move the netlink command code to a new NetlinkCommands file.
Put most of netd into the android::net namespace.
Diffstat (limited to 'server/InterfaceController.cpp')
| -rw-r--r-- | server/InterfaceController.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/server/InterfaceController.cpp b/server/InterfaceController.cpp index 1d0a8e0d..ed5d8d0e 100644 --- a/server/InterfaceController.cpp +++ b/server/InterfaceController.cpp @@ -32,6 +32,7 @@ using android::base::StringPrintf; using android::base::ReadFileToString; using android::base::WriteStringToFile; +using android::net::RouteController; namespace { |