Snap for 4434599 from 7370d8bd0735bd3e03d1bdcf4222679cf8095767 to pi-release

Change-Id: Ieccf1227b0660450adb0a5ece033417a7786f5e9
This commit is contained in:
android-build-team Robot
2017-11-05 07:24:46 +00:00

View File

@@ -189,7 +189,8 @@ public class NetworkIdentity implements Comparable<NetworkIdentity> {
String subscriberId = null; String subscriberId = null;
String networkId = null; String networkId = null;
boolean roaming = false; boolean roaming = !state.networkCapabilities.hasCapability(
NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING);
boolean metered = !state.networkCapabilities.hasCapability( boolean metered = !state.networkCapabilities.hasCapability(
NetworkCapabilities.NET_CAPABILITY_NOT_METERED); NetworkCapabilities.NET_CAPABILITY_NOT_METERED);
@@ -203,7 +204,6 @@ public class NetworkIdentity implements Comparable<NetworkIdentity> {
} }
subscriberId = state.subscriberId; subscriberId = state.subscriberId;
roaming = state.networkInfo.isRoaming();
} else if (type == TYPE_WIFI) { } else if (type == TYPE_WIFI) {
if (state.networkId != null) { if (state.networkId != null) {