joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Improve dumpsys logs for NetworkProvider and NetworkOffer" am: 58f5b1a89e

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

Change-Id: Ic6d7ea676d6fb95bb18a0da27a394560254442ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Junyu Lai 2022-04-20 11:08:55 +00:00 • committed by Automerger Merge Worker
commit 7bc11250bd
2 changed files with 19 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
service/src/com/android/server/ConnectivityService.java
View file

@ -3266,11 +3266,12 @@ public class ConnectivityService extends IConnectivityManager.Stub
return;
}
pw.print("NetworkProviders for:");
pw.println("NetworkProviders for:");
pw.increaseIndent();
for (NetworkProviderInfo npi : mNetworkProviderInfos.values()) {
pw.print(" " + npi.name);
pw.println(npi.providerId + ": " + npi.name);
}
pw.println();
pw.decreaseIndent();
pw.println();
final NetworkAgentInfo defaultNai = getDefaultNetwork();
@ -3319,6 +3320,14 @@ public class ConnectivityService extends IConnectivityManager.Stub
pw.decreaseIndent();
pw.println();
pw.println("Network Offers:");
pw.increaseIndent();
for (final NetworkOfferInfo offerInfo : mNetworkOffers) {
pw.println(offerInfo.offer);
}
pw.decreaseIndent();
pw.println();
mLegacyTypeTracker.dump(pw);
pw.println();

8
service/src/com/android/server/connectivity/NetworkOffer.java
View file

@ -22,6 +22,7 @@ import android.net.NetworkCapabilities;
import android.net.NetworkRequest;
import android.os.RemoteException;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.Objects;
import java.util.Set;
@ -143,6 +144,11 @@ public class NetworkOffer implements NetworkRanker.Scoreable {
@Override
public String toString() {
return "NetworkOffer [ Score " + score + " Caps " + caps + "]";
final ArrayList<Integer> neededRequestIds = new ArrayList<>();
for (final NetworkRequest request : mCurrentlyNeeded) {
neededRequestIds.add(request.requestId);
}
return "NetworkOffer [ Provider Id (" + providerId + ") " + score + " Caps "
+ caps + " Needed by " + neededRequestIds + "]";
}
}