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

Merge "Fix default network transition event recording" into nyc-dev am: 9d4e66ece6

Browse Source 
am: bfbf55fcbd

* commit 'bfbf55fcbd5cbd347642023ab46b22d114f22592':
  Fix default network transition event recording

Change-Id: Ife822c39d617f89dde4cda5f2137b80425fe89ad
This commit is contained in:
Hugo Benichi
2016-05-25 03:37:19 +00:00
committed by android-build-merger
parent 332a2b1750 bfbf55fcbd
commit 06facea297
2 changed files with 31 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,8 +68,28 @@ public final class DefaultNetworkEvent extends IpConnectivityEvent implements Pa
@Override
public String toString() {
return String.format("DefaultNetworkEvent(%d -> %d, %s, IPv4: %b, IPv6: %b)", prevNetId,
netId, NetworkCapabilities.transportNamesOf(transportTypes), prevIPv4, prevIPv6);
String prevNetwork = String.valueOf(prevNetId);
String newNetwork = String.valueOf(netId);
if (prevNetId != 0) {
prevNetwork += ":" + ipSupport();
}
if (netId != 0) {
newNetwork += ":" + NetworkCapabilities.transportNamesOf(transportTypes);
}
return String.format("DefaultNetworkEvent(%s -> %s)", prevNetwork, newNetwork);
}
private String ipSupport() {
if (prevIPv4 && prevIPv6) {
return "DUAL";
}
if (prevIPv6) {
return "IPv6";
}
if (prevIPv4) {
return "IPv4";
}
return "NONE";
}
public static final Parcelable.Creator<DefaultNetworkEvent> CREATOR