commit 5812e6485042a917b5fdc7dd38e29e231ca557f6
author Lorenzo Colitti <lorenzo@google.com> Mon Mar 28 16:46:15 2016 +0900
committer Lorenzo Colitti <lorenzo@google.com> Mon Mar 28 17:32:19 2016 +0900
tree 6a138a2768c0e1faaeb1ce83d5ce1bcb0fa8efc8
parent 1e632ba426ac3e07b82299505aa32495ebb3c709

Rename IpManager#dumpApf to #dump and change its signature.

Also give it a bit of indentation.

Bug: 26991160
Change-Id: I8a85276e76e15f452075931747552b486598f0e9

services/net/java/android/net/ip/IpManager.java

diff --git a/services/net/java/android/net/ip/IpManager.java b/services/net/java/android/net/ip/IpManager.java
index 66c7909..c25fae3 100644
--- a/services/net/java/android/net/ip/IpManager.java
+++ b/services/net/java/android/net/ip/IpManager.java
@@ -45,6 +45,7 @@
 import com.android.internal.util.StateMachine;
 import com.android.server.net.NetlinkTracker;
 
+import java.io.FileDescriptor;
 import java.io.PrintWriter;
 import java.net.InetAddress;
 import java.net.NetworkInterface;
@@ -211,6 +212,8 @@
         }
     }
 
+    public static final String DUMP_ARG = "ipmanager";
+
     private static final int CMD_STOP = 1;
     private static final int CMD_START = 2;
     private static final int CMD_CONFIRM = 3;
@@ -393,17 +396,18 @@
         }
     }
 
-    public void dumpApf(PrintWriter writer) {
-        writer.println("--------------------------------------------------------------------");
-        writer.println("APF dump:");
+    public void dump(FileDescriptor fd, PrintWriter writer, String[] args) {
+        IndentingPrintWriter pw = new IndentingPrintWriter(writer, "  ");
+        pw.println("APF dump:");
+        pw.increaseIndent();
         // Thread-unsafe access to mApfFilter but just used for debugging.
         ApfFilter apfFilter = mApfFilter;
         if (apfFilter != null) {
-            apfFilter.dump(new IndentingPrintWriter(writer, "  "));
+            apfFilter.dump(pw);
         } else {
-            writer.println("No apf support");
+            pw.println("No apf support");
         }
-        writer.println("--------------------------------------------------------------------");
+        pw.decreaseIndent();
     }