commit b257d61cd55c00a50d1eaaf4e7fcf436185c9a2c
author Luke Huang <huangluke@google.com> Thu Mar 14 21:19:13 2019 +0800
committer Luke Huang <huangluke@google.com> Fri Mar 15 05:39:32 2019 +0000
tree 64d7506a60930613bd01650636c7525b09435b5f
parent 2142a2b0554c9e06e2be272020d02819e046c0b3

Move DumpWriter to libnetdutils

resolver related component in libnetd_resolv
needs it to easily print dump log.

Bug: 122564854
Test: built, flashed, booted
      system/netd/tests/runtests.sh pass
      adb shell dumpsys netd, worked fine

Change-Id: Ic97d5f21b738fc3074e9308f4846191e744ed479

server/NetworkController.h

diff --git a/server/NetworkController.h b/server/NetworkController.h
index 984f507..d765ae7 100644
--- a/server/NetworkController.h
+++ b/server/NetworkController.h
@@ -23,6 +23,7 @@
 
 #include "NetdConstants.h"
 #include "Permission.h"
+#include "netdutils/DumpWriter.h"
 
 #include <sys/types.h>
 #include <list>
@@ -70,7 +71,6 @@
     return (((net_handle_t)fromNetId << 32) | kHandleMagic);
 }
 
-class DumpWriter;
 class Network;
 class UidRanges;
 class VirtualNetwork;
@@ -140,9 +140,9 @@
     void allowProtect(const std::vector<uid_t>& uids);
     void denyProtect(const std::vector<uid_t>& uids);
 
-    void dump(DumpWriter& dw);
+    void dump(netdutils::DumpWriter& dw);
 
-private:
+  private:
     bool isValidNetworkLocked(unsigned netId) const;
     Network* getNetworkLocked(unsigned netId) const;
     uint32_t getNetworkForDnsLocked(unsigned* netId, uid_t uid) const;