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

Merge "Updating formatting and text for per-app dumpsys"

Browse Source
This commit is contained in:
Treehugger Robot
2021-10-03 05:53:26 +00:00
committed by Gerrit Code Review
parent 05fd386de8 8b298a00b2
commit 7ece4bb71e
1 changed files with 42 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
service/src/com/android/server/ConnectivityService.java
View File

@@ -3014,9 +3014,9 @@ public class ConnectivityService extends IConnectivityManager.Stub
} }
pw.println(); pw.println();
pw.print("Current per-app default networks: "); pw.println("Current network preferences: ");
pw.increaseIndent(); pw.increaseIndent();
dumpPerAppNetworkPreferences(pw); dumpNetworkPreferences(pw);
pw.decreaseIndent(); pw.decreaseIndent();
pw.println(); pw.println();
@@ -3144,37 +3144,55 @@ public class ConnectivityService extends IConnectivityManager.Stub
} }
} }
private void dumpPerAppNetworkPreferences(IndentingPrintWriter pw) { private void dumpNetworkPreferences(IndentingPrintWriter pw) {
pw.println("Per-App Network Preference:"); if (!mProfileNetworkPreferences.isEmpty()) {
pw.println("Profile preferences:");
pw.increaseIndent(); pw.increaseIndent();
if (0 == mOemNetworkPreferences.getNetworkPreferences().size()) { pw.println(mProfileNetworkPreferences.preferences);
pw.println("none");
} else {
pw.println(mOemNetworkPreferences.toString());
}
pw.decreaseIndent(); pw.decreaseIndent();
}
if (!mOemNetworkPreferences.isEmpty()) {
pw.println("OEM preferences:");
pw.increaseIndent();
pw.println(mOemNetworkPreferences);
pw.decreaseIndent();
}
if (!mMobileDataPreferredUids.isEmpty()) {
pw.println("Mobile data preferred UIDs:");
pw.increaseIndent();
pw.println(mMobileDataPreferredUids);
pw.decreaseIndent();
}
pw.println("Default requests:");
pw.increaseIndent();
dumpPerAppDefaultRequests(pw);
pw.decreaseIndent();
}
private void dumpPerAppDefaultRequests(IndentingPrintWriter pw) {
for (final NetworkRequestInfo defaultRequest : mDefaultNetworkRequests) { for (final NetworkRequestInfo defaultRequest : mDefaultNetworkRequests) {
if (mDefaultRequest == defaultRequest) { if (mDefaultRequest == defaultRequest) {
continue; continue;
} }
final boolean isActive = null != defaultRequest.getSatisfier(); final NetworkAgentInfo satisfier = defaultRequest.getSatisfier();
pw.println("Is per-app network active:"); final String networkOutput;
pw.increaseIndent(); if (null == satisfier) {
pw.println(isActive); networkOutput = "null";
if (isActive) { } else if (mNoServiceNetwork.equals(satisfier)) {
pw.println("Active network: " + defaultRequest.getSatisfier().network.netId); networkOutput = "no service network";
}
pw.println("Tracked UIDs:");
pw.increaseIndent();
if (0 == defaultRequest.mRequests.size()) {
pw.println("none, this should never occur.");
} else { } else {
pw.println(defaultRequest.mRequests.get(0).networkCapabilities.getUidRanges()); networkOutput = String.valueOf(satisfier.network.netId);
} }
pw.decreaseIndent(); final String asUidString = (defaultRequest.mAsUid == defaultRequest.mUid)
pw.decreaseIndent(); ? "" : " asUid: " + defaultRequest.mAsUid;
final String requestInfo = "Request: [uid/pid:" + defaultRequest.mUid + "/"
+ defaultRequest.mPid + asUidString + "]";
final String satisfierOutput = "Satisfier: [" + networkOutput + "]"
+ " Preference order: " + defaultRequest.mPreferenceOrder
+ " Tracked UIDs: " + defaultRequest.getUids();
pw.println(requestInfo + " - " + satisfierOutput);
} }
} }