Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rename IpManager#dumpApf to #dump and change its signature." into nyc-dev

Browse Source
This commit is contained in:
Lorenzo Colitti
2016-03-29 01:44:17 +00:00
committed by Android (Google) Code Review
parent 9007136ee9 5812e64850
commit f54aede6db
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
services/net/java/android/net/ip/IpManager.java
View File

@@ -45,6 +45,7 @@ import com.android.internal.util.State;
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 class IpManager extends StateMachine {
}
}
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 class IpManager extends StateMachine {
}
}
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();
}