Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove hidden API usage in metrics toString" am: 179419f810 am: a25a3759ab

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

Change-Id: I6c247fddeaa2aceb523d569bf00edafdcff145a1
This commit is contained in:
Remi NGUYEN VAN
2020-12-03 04:30:09 +00:00
committed by Automerger Merge Worker
parent e1dda8a0a6 a25a3759ab
commit abffb069ec
6 changed files with 19 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/net/ConnectivityMetricsEvent.java
View File

@@ -19,7 +19,7 @@ package android.net;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; 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. * Represents a core networking event defined in package android.net.metrics.
@@ -86,9 +86,7 @@ public final class ConnectivityMetricsEvent implements Parcelable {
if (ifname != null) { if (ifname != null) {
buffer.append(", ").append(ifname); buffer.append(", ").append(ifname);
} }
for (int t : BitUtils.unpackBits(transports)) { buffer.append(", transports=").append(BitSet.valueOf(new long[] { transports }));
buffer.append(", ").append(NetworkCapabilities.transportNameOf(t));
}
buffer.append("): ").append(data.toString()); buffer.append("): ").append(data.toString());
return buffer.toString(); return buffer.toString();
} }

3
core/java/android/net/NetworkIdentity.java
View File

@@ -17,7 +17,6 @@
package android.net; package android.net;
import static android.net.ConnectivityManager.TYPE_WIFI; import static android.net.ConnectivityManager.TYPE_WIFI;
import static android.net.ConnectivityManager.getNetworkTypeName;
import static android.net.ConnectivityManager.isNetworkTypeMobile; import static android.net.ConnectivityManager.isNetworkTypeMobile;
import android.content.Context; import android.content.Context;
@@ -84,7 +83,7 @@ public class NetworkIdentity implements Comparable<NetworkIdentity> {
@Override @Override
public String toString() { public String toString() {
final StringBuilder builder = new StringBuilder("{"); final StringBuilder builder = new StringBuilder("{");
builder.append("type=").append(getNetworkTypeName(mType)); builder.append("type=").append(mType);
builder.append(", subType="); builder.append(", subType=");
if (mSubType == SUBTYPE_COMBINED) { if (mSubType == SUBTYPE_COMBINED) {
builder.append("COMBINED"); builder.append("COMBINED");

11
core/java/android/net/metrics/ConnectStats.java
View File

@@ -16,14 +16,14 @@
package android.net.metrics; package android.net.metrics;
import android.net.NetworkCapabilities;
import android.system.OsConstants; import android.system.OsConstants;
import android.util.IntArray; import android.util.IntArray;
import android.util.SparseIntArray; import android.util.SparseIntArray;
import com.android.internal.util.BitUtils;
import com.android.internal.util.TokenBucket; import com.android.internal.util.TokenBucket;
import java.util.BitSet;
/** /**
* A class that aggregates connect() statistics. * A class that aggregates connect() statistics.
* {@hide} * {@hide}
@@ -120,10 +120,9 @@ public class ConnectStats {
@Override @Override
public String toString() { public String toString() {
StringBuilder builder = StringBuilder builder =
new StringBuilder("ConnectStats(").append("netId=").append(netId).append(", "); new StringBuilder("ConnectStats(").append("netId=").append(netId)
for (int t : BitUtils.unpackBits(transports)) { .append(", transports=").append(BitSet.valueOf(new long[] { transports }))
builder.append(NetworkCapabilities.transportNameOf(t)).append(", "); .append(", ");
}
builder.append(String.format("%d events, ", eventCount)); builder.append(String.format("%d events, ", eventCount));
builder.append(String.format("%d success, ", connectCount)); builder.append(String.format("%d success, ", connectCount));
builder.append(String.format("%d blocking, ", connectBlockingCount)); builder.append(String.format("%d blocking, ", connectBlockingCount));

15
core/java/android/net/metrics/DefaultNetworkEvent.java
View File

@@ -16,12 +16,7 @@
package android.net.metrics; package android.net.metrics;
import static android.net.ConnectivityManager.NETID_UNSET; import java.util.BitSet;
import android.net.NetworkCapabilities;
import com.android.internal.util.BitUtils;
import java.util.StringJoiner; import java.util.StringJoiner;
/** /**
@@ -32,8 +27,8 @@ public class DefaultNetworkEvent {
// The creation time in milliseconds of this DefaultNetworkEvent. // The creation time in milliseconds of this DefaultNetworkEvent.
public final long creationTimeMs; public final long creationTimeMs;
// The network ID of the network or NETID_UNSET if none. // The network ID of the network or 0 if none.
public int netId = NETID_UNSET; public int netId = 0;
// The list of transport types, as defined in NetworkCapabilities.java. // The list of transport types, as defined in NetworkCapabilities.java.
public int transports; public int transports;
// The list of transport types of the last previous default network. // The list of transport types of the last previous default network.
@@ -63,9 +58,7 @@ public class DefaultNetworkEvent {
public String toString() { public String toString() {
StringJoiner j = new StringJoiner(", ", "DefaultNetworkEvent(", ")"); StringJoiner j = new StringJoiner(", ", "DefaultNetworkEvent(", ")");
j.add("netId=" + netId); j.add("netId=" + netId);
for (int t : BitUtils.unpackBits(transports)) { j.add("transports=" + BitSet.valueOf(new long[] { transports }));
j.add(NetworkCapabilities.transportNameOf(t));
}
j.add("ip=" + ipSupport()); j.add("ip=" + ipSupport());
if (initialScore > 0) { if (initialScore > 0) {
j.add("initial_score=" + initialScore); j.add("initial_score=" + initialScore);

13
core/java/android/net/metrics/DnsEvent.java
View File

@@ -16,11 +16,8 @@
package android.net.metrics; package android.net.metrics;
import android.net.NetworkCapabilities;
import com.android.internal.util.BitUtils;
import java.util.Arrays; import java.util.Arrays;
import java.util.BitSet;
/** /**
* A batch of DNS events recorded by NetdEventListenerService for a specific network. * A batch of DNS events recorded by NetdEventListenerService for a specific network.
@@ -86,10 +83,10 @@ final public class DnsEvent {
@Override @Override
public String toString() { public String toString() {
StringBuilder builder = StringBuilder builder =
new StringBuilder("DnsEvent(").append("netId=").append(netId).append(", "); new StringBuilder("DnsEvent(").append("netId=").append(netId)
for (int t : BitUtils.unpackBits(transports)) { .append(", transports=")
builder.append(NetworkCapabilities.transportNameOf(t)).append(", "); .append(BitSet.valueOf(new long[] { transports }))
} .append(", ");
builder.append(String.format("%d events, ", eventCount)); builder.append(String.format("%d events, ", eventCount));
builder.append(String.format("%d success)", successCount)); builder.append(String.format("%d success)", successCount));
return builder.toString(); return builder.toString();

8
core/java/android/net/metrics/NetworkMetrics.java
View File

@@ -16,11 +16,9 @@
package android.net.metrics; package android.net.metrics;
import android.net.NetworkCapabilities;
import com.android.internal.util.BitUtils;
import com.android.internal.util.TokenBucket; import com.android.internal.util.TokenBucket;
import java.util.BitSet;
import java.util.StringJoiner; import java.util.StringJoiner;
/** /**
@@ -144,9 +142,7 @@ public class NetworkMetrics {
public String toString() { public String toString() {
StringJoiner j = new StringJoiner(", ", "{", "}"); StringJoiner j = new StringJoiner(", ", "{", "}");
j.add("netId=" + netId); j.add("netId=" + netId);
for (int t : BitUtils.unpackBits(transports)) { j.add("transports=" + BitSet.valueOf(new long[] { transports }));
j.add(NetworkCapabilities.transportNameOf(t));
}
j.add(String.format("dns avg=%dms max=%dms err=%.1f%% tot=%d", j.add(String.format("dns avg=%dms max=%dms err=%.1f%% tot=%d",
(int) dnsLatencies.average(), (int) dnsLatencies.max, (int) dnsLatencies.average(), (int) dnsLatencies.max,
100 * dnsErrorRate.average(), dnsErrorRate.count)); 100 * dnsErrorRate.average(), dnsErrorRate.count));