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

Commit 30cadee7 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Automerger Merge Worker
Browse files

Merge "Remove hidden API usage in metrics toString" am: 179419f8 am: a25a3759 am: abffb069 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1512876

Change-Id: Ifc7f3dc43a4bdea06e82ae18bd03fce0932ad927
parents c96fa645 abffb069

core/java/android/net/ConnectivityMetricsEvent.java

+2 −4
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ package android.net; 
import android.os.Parcel;

import android.os.Parcelable;



import com.android.internal.util.BitUtils;

import java.util.BitSet;



/**

 * Represents a core networking event defined in package android.net.metrics.
@@ -86,9 +86,7 @@ public final class ConnectivityMetricsEvent implements Parcelable { 
        if (ifname != null) {

            buffer.append(", ").append(ifname);

        }

        for (int t : BitUtils.unpackBits(transports)) {

            buffer.append(", ").append(NetworkCapabilities.transportNameOf(t));

        }

        buffer.append(", transports=").append(BitSet.valueOf(new long[] { transports }));

        buffer.append("): ").append(data.toString());

        return buffer.toString();

    }

core/java/android/net/NetworkIdentity.java

+1 −2
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package android.net;



import static android.net.ConnectivityManager.TYPE_WIFI;

import static android.net.ConnectivityManager.getNetworkTypeName;

import static android.net.ConnectivityManager.isNetworkTypeMobile;



import android.annotation.Nullable;
@@ -85,7 +84,7 @@ public class NetworkIdentity implements Comparable<NetworkIdentity> { 
    @Override

    public String toString() {

        final StringBuilder builder = new StringBuilder("{");

        builder.append("type=").append(getNetworkTypeName(mType));

        builder.append("type=").append(mType);

        builder.append(", subType=");

        if (mSubType == SUBTYPE_COMBINED) {

            builder.append("COMBINED");

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

+5 −6
Original line number Diff line number Diff line
@@ -16,14 +16,14 @@ 


package android.net.metrics;



import android.net.NetworkCapabilities;

import android.system.OsConstants;

import android.util.IntArray;

import android.util.SparseIntArray;



import com.android.internal.util.BitUtils;

import com.android.internal.util.TokenBucket;



import java.util.BitSet;



/**

 * A class that aggregates connect() statistics.

 * {@hide}
@@ -120,10 +120,9 @@ public class ConnectStats { 
    @Override

    public String toString() {

        StringBuilder builder =

                new StringBuilder("ConnectStats(").append("netId=").append(netId).append(", ");

        for (int t : BitUtils.unpackBits(transports)) {

            builder.append(NetworkCapabilities.transportNameOf(t)).append(", ");

        }

                new StringBuilder("ConnectStats(").append("netId=").append(netId)

                        .append(", transports=").append(BitSet.valueOf(new long[] { transports }))

                        .append(", ");

        builder.append(String.format("%d events, ", eventCount));

        builder.append(String.format("%d success, ", connectCount));

        builder.append(String.format("%d blocking, ", connectBlockingCount));

core/java/android/net/metrics/DefaultNetworkEvent.java

+4 −11
Original line number Diff line number Diff line
@@ -16,12 +16,7 @@ 


package android.net.metrics;



import static android.net.ConnectivityManager.NETID_UNSET;



import android.net.NetworkCapabilities;



import com.android.internal.util.BitUtils;



import java.util.BitSet;

import java.util.StringJoiner;



/**
@@ -32,8 +27,8 @@ public class DefaultNetworkEvent { 


    // The creation time in milliseconds of this DefaultNetworkEvent.

    public final long creationTimeMs;

    // The network ID of the network or NETID_UNSET if none.

    public int netId = NETID_UNSET;

    // The network ID of the network or 0 if none.

    public int netId = 0;

    // The list of transport types, as defined in NetworkCapabilities.java.

    public int transports;

    // The list of transport types of the last previous default network.
@@ -63,9 +58,7 @@ public class DefaultNetworkEvent { 
    public String toString() {

        StringJoiner j = new StringJoiner(", ", "DefaultNetworkEvent(", ")");

        j.add("netId=" + netId);

        for (int t : BitUtils.unpackBits(transports)) {

            j.add(NetworkCapabilities.transportNameOf(t));

        }

        j.add("transports=" + BitSet.valueOf(new long[] { transports }));

        j.add("ip=" + ipSupport());

        if (initialScore > 0) {

            j.add("initial_score=" + initialScore);

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

+5 −8
Original line number Diff line number Diff line
@@ -16,11 +16,8 @@ 


package android.net.metrics;



import android.net.NetworkCapabilities;



import com.android.internal.util.BitUtils;



import java.util.Arrays;

import java.util.BitSet;



/**

 * A batch of DNS events recorded by NetdEventListenerService for a specific network.
@@ -86,10 +83,10 @@ final public class DnsEvent { 
    @Override

    public String toString() {

        StringBuilder builder =

                new StringBuilder("DnsEvent(").append("netId=").append(netId).append(", ");

        for (int t : BitUtils.unpackBits(transports)) {

            builder.append(NetworkCapabilities.transportNameOf(t)).append(", ");

        }

                new StringBuilder("DnsEvent(").append("netId=").append(netId)

                        .append(", transports=")

                        .append(BitSet.valueOf(new long[] { transports }))

                        .append(", ");

        builder.append(String.format("%d events, ", eventCount));

        builder.append(String.format("%d success)", successCount));

        return builder.toString();