Merge "Shorten 'dumpsys connectivity trafficcontroller' for sLocalNetAccessMap and sLocalNetBlockedUidMap" into main
diff --git a/service/src/com/android/server/BpfNetMaps.java b/service/src/com/android/server/BpfNetMaps.java
index 25c0617..923920f 100644
--- a/service/src/com/android/server/BpfNetMaps.java
+++ b/service/src/com/android/server/BpfNetMaps.java
@@ -1325,11 +1325,11 @@
+ value.iif2 + "(" + mDeps.getIfName(value.iif2) + ")");
if (sLocalNetBlockedUidMap != null) {
BpfDump.dumpMap(sLocalNetAccessMap, pw, "sLocalNetAccessMap",
- (key, value) -> "[" + key + "]: " + value);
+ (key, value) -> "" + key + ": " + value.val);
}
if (sLocalNetBlockedUidMap != null) {
BpfDump.dumpMap(sLocalNetBlockedUidMap, pw, "sLocalNetBlockedUidMap",
- (key, value) -> "[" + key + "]: " + value);
+ (key, value) -> "" + key + ": " + value.val);
}
dumpDataSaverConfig(pw);
pw.decreaseIndent();