Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54803140 authored by Hugo Benichi's avatar Hugo Benichi Committed by android-build-merger
Browse files

Merge "Networking metrics: minor pretty printing improvements" 

am: ee56b4a6

Change-Id: I5a19824564a56881ffe0ea72556490c71c0d9c23
parents 6c25e1e2 ee56b4a6

core/java/android/net/ConnectivityMetricsEvent.java

+2 −1
Original line number Diff line number Diff line
@@ -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);

core/java/android/net/metrics/ConnectStats.java

+2 −1
Original line number Diff line number Diff line
@@ -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(", ");

        }

core/java/android/net/metrics/DnsEvent.java

+2 −1
Original line number Diff line number Diff line
@@ -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(", ");

        }