summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Hugo Benichi <hugobenichi@google.com> 2017-11-08 03:56:40 +0000
committer android-build-merger <android-build-merger@google.com> 2017-11-08 03:56:40 +0000
commite5b0f9f723a070e3de8a60d1851a63b2f048c170 (patch)
treea122531b5cbe5ec70a99a99cd9f24aedef1d0789
parent0a6e480d991764214169277621d364f77c93f4db (diff)
parent2e2763f0675dafea23893d44d3da9634637ff890 (diff)
Merge "Networking metrics: minor pretty printing improvements" am: ee56b4a65c am: 5480314039
am: 2e2763f067 Change-Id: I5c3d7acf4765daaa31b593f8cb51566de6cf89c5
-rw-r--r--core/java/android/net/ConnectivityMetricsEvent.java3
-rw-r--r--core/java/android/net/metrics/ConnectStats.java3
-rw-r--r--core/java/android/net/metrics/DnsEvent.java3
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(", ");
}