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" am: 7ece4bb71e am: 3a44ebe9a1

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1723618

Change-Id: I9f337cd566e780846c88042ba8edd277a205ebd0
This commit is contained in:
Treehugger Robot
2021-10-03 06:23:17 +00:00
committed by Automerger Merge Worker
parent 6bff95320d 3a44ebe9a1
commit 388ae1444f
1 changed files with 42 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3022,9 +3022,9 @@ public class ConnectivityService extends IConnectivityManager.Stub
}
pw.println();
pw.print("Current per-app default networks: ");
pw.println("Current network preferences: ");
pw.increaseIndent();
dumpPerAppNetworkPreferences(pw);
dumpNetworkPreferences(pw);
pw.decreaseIndent();
pw.println();
@@ -3152,37 +3152,55 @@ public class ConnectivityService extends IConnectivityManager.Stub
}
}
private void dumpPerAppNetworkPreferences(IndentingPrintWriter pw) {
pw.println("Per-App Network Preference:");
pw.increaseIndent();
if (0 == mOemNetworkPreferences.getNetworkPreferences().size()) {
pw.println("none");
} else {
pw.println(mOemNetworkPreferences.toString());
private void dumpNetworkPreferences(IndentingPrintWriter pw) {
if (!mProfileNetworkPreferences.isEmpty()) {
pw.println("Profile preferences:");
pw.increaseIndent();
pw.println(mProfileNetworkPreferences.preferences);
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.decreaseIndent();
pw.println("Default requests:");
pw.increaseIndent();
dumpPerAppDefaultRequests(pw);
pw.decreaseIndent();
}
private void dumpPerAppDefaultRequests(IndentingPrintWriter pw) {
for (final NetworkRequestInfo defaultRequest : mDefaultNetworkRequests) {
if (mDefaultRequest == defaultRequest) {
continue;
}
final boolean isActive = null != defaultRequest.getSatisfier();
pw.println("Is per-app network active:");
pw.increaseIndent();
pw.println(isActive);
if (isActive) {
pw.println("Active network: " + defaultRequest.getSatisfier().network.netId);
}
pw.println("Tracked UIDs:");
pw.increaseIndent();
if (0 == defaultRequest.mRequests.size()) {
pw.println("none, this should never occur.");
final NetworkAgentInfo satisfier = defaultRequest.getSatisfier();
final String networkOutput;
if (null == satisfier) {
networkOutput = "null";
} else if (mNoServiceNetwork.equals(satisfier)) {
networkOutput = "no service network";
} else {
pw.println(defaultRequest.mRequests.get(0).networkCapabilities.getUidRanges());
networkOutput = String.valueOf(satisfier.network.netId);
}
pw.decreaseIndent();
pw.decreaseIndent();
final String asUidString = (defaultRequest.mAsUid == defaultRequest.mUid)
? "" : " 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);
}
}