Merge "Support triggering confirmConfiguration() via dumpsys" into nyc-mr1-dev (0f53f6ff) · Commits · e / os / android_frameworks_base

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

+7 −0

Original line number	Diff line number	Diff line
		@@ -358,6 +358,7 @@ public class IpManager extends StateMachine {
		}

		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_START = 2;
		@@ -562,6 +563,12 @@ public class IpManager extends StateMachine {
		}

		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, " ");
		pw.println("APF dump:");
		pw.increaseIndent();