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

Merge "Support triggering confirmConfiguration() via dumpsys" into nyc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-09-28 15:46:30 +00:00
committed by Android (Google) Code Review
parent adc26ec1b4 c3eec4fff9
commit 0f53f6ffa2
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -358,6 +358,7 @@ public class IpManager extends StateMachine {
} }
public static final String DUMP_ARG = "ipmanager"; public static final String DUMP_ARG = "ipmanager";
public static final String DUMP_ARG_CONFIRM = "confirm";
private static final int CMD_STOP = 1; private static final int CMD_STOP = 1;
private static final int CMD_START = 2; private static final int CMD_START = 2;
@@ -562,6 +563,12 @@ public class IpManager extends StateMachine {
} }
public void dump(FileDescriptor fd, PrintWriter writer, String[] args) { public void dump(FileDescriptor fd, PrintWriter writer, String[] args) {
if (args.length > 0 && DUMP_ARG_CONFIRM.equals(args[0])) {
// Execute confirmConfiguration() and take no further action.
confirmConfiguration();
return;
}
IndentingPrintWriter pw = new IndentingPrintWriter(writer, " "); IndentingPrintWriter pw = new IndentingPrintWriter(writer, " ");
pw.println("APF dump:"); pw.println("APF dump:");
pw.increaseIndent(); pw.increaseIndent();