Merge "Support "dumpsys connectivity tethering"" am: 6cdcba7b48 am: 06e6033327 am: ff8b93f815 (f66b74ec) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/ConnectivityService.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -180,6 +180,7 @@ public class ConnectivityService extends IConnectivityManager.Stub

		public static final String DIAG_ARG = "--diag";
		public static final String SHORT_ARG = "--short";
		public static final String TETHERING_ARG = "tethering";

		private static final boolean DBG = true;
		private static final boolean VDBG = false;
		@@ -1842,7 +1843,7 @@ public class ConnectivityService extends IConnectivityManager.Stub

		private boolean argsContain(String[] args, String target) {
		for (String arg : args) {
		if (arg.equals(target)) return true;
		if (target.equals(arg)) return true;
		}
		return false;
		}
		@@ -1873,6 +1874,9 @@ public class ConnectivityService extends IConnectivityManager.Stub
		if (argsContain(args, DIAG_ARG)) {
		dumpNetworkDiagnostics(pw);
		return;
		} else if (argsContain(args, TETHERING_ARG)) {
		mTethering.dump(fd, pw, args);
		return;
		}

		pw.print("NetworkFactories for:");

+2 −1

Original line number	Diff line number	Diff line
		@@ -1696,6 +1696,7 @@ public class Tethering extends BaseNetworkObserver implements IControlsTethering
		pw.println(" - lastError = " + tetherState.lastError);
		}
		pw.println("Upstream wanted: " + upstreamWanted());
		pw.println("Current upstream interface: " + mCurrentUpstreamIface);
		pw.decreaseIndent();
		}

		@@ -1713,7 +1714,7 @@ public class Tethering extends BaseNetworkObserver implements IControlsTethering

		private static boolean argsContain(String[] args, String target) {
		for (String arg : args) {
		if (arg.equals(target)) return true;
		if (target.equals(arg)) return true;
		}
		return false;
		}