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

Merge "Support "dumpsys connectivity tethering"" am: 6cdcba7b48

Browse Source 
am: 06e6033327

Change-Id: Ib88b17502c344314cb81d9c0167c2610e55d8313
This commit is contained in:
Erik Kline
2017-05-29 08:48:38 +00:00
committed by android-build-merger
parent 880974f111 06e6033327
commit ff8b93f815
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -185,6 +185,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;
@@ -1936,7 +1937,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;
}
@@ -1974,6 +1975,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:");

3
services/core/java/com/android/server/connectivity/Tethering.java
View File

@@ -1685,6 +1685,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();
}
@@ -1702,7 +1703,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;
}