joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge changes I8de95add,Ia6f4ccfd into nyc-dev

Browse source 
am: 6333d09

* commit '6333d09474':
  Remove unused event tags of IpConnectivityEvent
  Better ConnectivityMetricsEvent printing

Change-Id: I57ce8977a481d3c9a441ea4dab407ec367e3adca
This commit is contained in:
Hugo Benichi 2016-04-27 01:57:13 +00:00 • committed by android-build-merger
commit bd858ec5d9
1 changed files with 19 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

30
core/java/android/net/NetworkCapabilities.java
View file

@ -809,17 +809,7 @@ public final class NetworkCapabilities implements Parcelable {
@Override @Override
public String toString() { public String toString() {
int[] types = getTransportTypes(); int[] types = getTransportTypes();
String transports = (types.length > 0 ? " Transports: " : ""); String transports = (types.length > 0) ? " Transports: " + transportNamesOf(types) : "";
for (int i = 0; i < types.length;) {
switch (types[i]) {
case TRANSPORT_CELLULAR: transports += "CELLULAR"; break;
case TRANSPORT_WIFI: transports += "WIFI"; break;
case TRANSPORT_BLUETOOTH: transports += "BLUETOOTH"; break;
case TRANSPORT_ETHERNET: transports += "ETHERNET"; break;
case TRANSPORT_VPN: transports += "VPN"; break;
}
if (++i < types.length) transports += "|";
}
types = getCapabilities(); types = getCapabilities();
String capabilities = (types.length > 0 ? " Capabilities: " : ""); String capabilities = (types.length > 0 ? " Capabilities: " : "");
@ -859,4 +849,22 @@ public final class NetworkCapabilities implements Parcelable {
return "[" + transports + capabilities + upBand + dnBand + specifier + signalStrength + "]"; return "[" + transports + capabilities + upBand + dnBand + specifier + signalStrength + "]";
} }
/**
* @hide
*/
public static String transportNamesOf(int[] types) {
String transports = "";
for (int i = 0; i < types.length;) {
switch (types[i]) {
case TRANSPORT_CELLULAR: transports += "CELLULAR"; break;
case TRANSPORT_WIFI: transports += "WIFI"; break;
case TRANSPORT_BLUETOOTH: transports += "BLUETOOTH"; break;
case TRANSPORT_ETHERNET: transports += "ETHERNET"; break;
case TRANSPORT_VPN: transports += "VPN"; break;
}
if (++i < types.length) transports += "|";
}
return transports;
}
} }