LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Add static IpClient logging"

Browse Source 
am: 3f966e9c62

Change-Id: Id566002382162a848de91b85559e69bc6f7ea28d
This commit is contained in:
Erik Kline
2018-05-03 05:05:05 -07:00
committed by android-build-merger
parent 7df94359d4 3f966e9c62
commit 946050d3fd
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -129,6 +129,7 @@ import com.android.internal.net.NetworkStatsFactory;
import com.android.internal.net.VpnConfig; import com.android.internal.net.VpnConfig;
import com.android.internal.net.VpnInfo; import com.android.internal.net.VpnInfo;
import com.android.internal.net.VpnProfile; import com.android.internal.net.VpnProfile;
import com.android.internal.util.ArrayUtils;
import com.android.internal.util.AsyncChannel; import com.android.internal.util.AsyncChannel;
import com.android.internal.util.DumpUtils; import com.android.internal.util.DumpUtils;
import com.android.internal.util.IndentingPrintWriter; import com.android.internal.util.IndentingPrintWriter;
@@ -1935,13 +1936,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
return ret; return ret;
} }
private boolean argsContain(String[] args, String target) {
for (String arg : args) {
if (target.equals(arg)) return true;
}
return false;
}
private void dumpNetworkDiagnostics(IndentingPrintWriter pw) { private void dumpNetworkDiagnostics(IndentingPrintWriter pw) {
final List<NetworkDiagnostics> netDiags = new ArrayList<NetworkDiagnostics>(); final List<NetworkDiagnostics> netDiags = new ArrayList<NetworkDiagnostics>();
final long DIAG_TIME_MS = 5000; final long DIAG_TIME_MS = 5000;
@@ -1965,10 +1959,10 @@ public class ConnectivityService extends IConnectivityManager.Stub
final IndentingPrintWriter pw = new IndentingPrintWriter(writer, " "); final IndentingPrintWriter pw = new IndentingPrintWriter(writer, " ");
if (!DumpUtils.checkDumpPermission(mContext, TAG, pw)) return; if (!DumpUtils.checkDumpPermission(mContext, TAG, pw)) return;
if (argsContain(args, DIAG_ARG)) { if (ArrayUtils.contains(args, DIAG_ARG)) {
dumpNetworkDiagnostics(pw); dumpNetworkDiagnostics(pw);
return; return;
} else if (argsContain(args, TETHERING_ARG)) { } else if (ArrayUtils.contains(args, TETHERING_ARG)) {
mTethering.dump(fd, pw, args); mTethering.dump(fd, pw, args);
return; return;
} }
@@ -2033,7 +2027,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
pw.println(); pw.println();
dumpAvoidBadWifiSettings(pw); dumpAvoidBadWifiSettings(pw);
if (argsContain(args, SHORT_ARG) == false) { if (ArrayUtils.contains(args, SHORT_ARG) == false) {
pw.println(); pw.println();
synchronized (mValidationLogs) { synchronized (mValidationLogs) {
pw.println("mValidationLogs (most recent first):"); pw.println("mValidationLogs (most recent first):");