From c867f787bc7b6ecd49fe3a9c638b34befc3922ec Mon Sep 17 00:00:00 2001 From: Hugo Benichi Date: Tue, 7 Nov 2017 21:42:10 +0900 Subject: Networking metrics: minor pretty printing improvements Bug: 65700460 Test: manually verified the output of $ adb shell dumpsys connmetrics Change-Id: Ieae535b48d2e2b6e9087431d345c8f916006bb6c --- core/java/android/net/ConnectivityMetricsEvent.java | 3 ++- core/java/android/net/metrics/ConnectStats.java | 3 ++- core/java/android/net/metrics/DnsEvent.java | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/core/java/android/net/ConnectivityMetricsEvent.java b/core/java/android/net/ConnectivityMetricsEvent.java index 46bb34670611..394ac428a03d 100644 --- a/core/java/android/net/ConnectivityMetricsEvent.java +++ b/core/java/android/net/ConnectivityMetricsEvent.java @@ -18,6 +18,7 @@ package android.net; import android.os.Parcel; import android.os.Parcelable; + import com.android.internal.util.BitUtils; /** @@ -80,7 +81,7 @@ public final class ConnectivityMetricsEvent implements Parcelable { StringBuilder buffer = new StringBuilder("ConnectivityMetricsEvent("); buffer.append(String.format("%tT.%tL", timestamp, timestamp)); if (netId != 0) { - buffer.append(", ").append(netId); + buffer.append(", ").append("netId=").append(netId); } if (ifname != null) { buffer.append(", ").append(ifname); diff --git a/core/java/android/net/metrics/ConnectStats.java b/core/java/android/net/metrics/ConnectStats.java index 2495cab1adf9..b320b755f3f4 100644 --- a/core/java/android/net/metrics/ConnectStats.java +++ b/core/java/android/net/metrics/ConnectStats.java @@ -119,7 +119,8 @@ public class ConnectStats { @Override public String toString() { - StringBuilder builder = new StringBuilder("ConnectStats(").append(netId).append(", "); + StringBuilder builder = + new StringBuilder("ConnectStats(").append("netId=").append(netId).append(", "); for (int t : BitUtils.unpackBits(transports)) { builder.append(NetworkCapabilities.transportNameOf(t)).append(", "); } diff --git a/core/java/android/net/metrics/DnsEvent.java b/core/java/android/net/metrics/DnsEvent.java index 81b098bbb38e..5aa705b0edf3 100644 --- a/core/java/android/net/metrics/DnsEvent.java +++ b/core/java/android/net/metrics/DnsEvent.java @@ -85,7 +85,8 @@ final public class DnsEvent { @Override public String toString() { - StringBuilder builder = new StringBuilder("DnsEvent(").append(netId).append(", "); + StringBuilder builder = + new StringBuilder("DnsEvent(").append("netId=").append(netId).append(", "); for (int t : BitUtils.unpackBits(transports)) { builder.append(NetworkCapabilities.transportNameOf(t)).append(", "); } -- cgit v1.2.3-59-g8ed1b