Merge "Expand logging capabilities of Tethering subsystem"

This commit is contained in:
Treehugger Robot
2017-05-18 03:25:28 +00:00
committed by Gerrit Code Review

View File

@@ -183,6 +183,9 @@ public class ConnectivityService extends IConnectivityManager.Stub
implements PendingIntent.OnFinished { implements PendingIntent.OnFinished {
private static final String TAG = ConnectivityService.class.getSimpleName(); private static final String TAG = ConnectivityService.class.getSimpleName();
public static final String DIAG_ARG = "--diag";
public static final String SHORT_ARG = "--short";
private static final boolean DBG = true; private static final boolean DBG = true;
private static final boolean VDBG = false; private static final boolean VDBG = false;
@@ -1961,7 +1964,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
return; return;
} }
if (argsContain(args, "--diag")) { if (argsContain(args, DIAG_ARG)) {
dumpNetworkDiagnostics(pw); dumpNetworkDiagnostics(pw);
return; return;
} }
@@ -2053,7 +2056,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
pw.println(); pw.println();
dumpAvoidBadWifiSettings(pw); dumpAvoidBadWifiSettings(pw);
if (argsContain(args, "--short") == false) { if (argsContain(args, SHORT_ARG) == false) {
pw.println(); pw.println();
synchronized (mValidationLogs) { synchronized (mValidationLogs) {
pw.println("mValidationLogs (most recent first):"); pw.println("mValidationLogs (most recent first):");