LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Define NOT_ROAMING network capability." am: 8f380ab29c

Browse Source 
am: 3fe1ae29cd

Change-Id: Ib511f7af82c80fd4e95f4da9de1fdce200deb987
This commit is contained in:
Jeff Sharkey
2017-11-03 23:07:03 +00:00
committed by android-build-merger
parent 3794b5692e 7c19a1abd6
commit 0a2582193e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/net/NetworkIdentity.java
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) {