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

am 7a3077a9: Merge "Make requests for restricted networks not require unrestricted access." into lmp-preview-dev

Browse Source 
* commit '7a3077a9a7405048b9cd28452efbc28a857acb25':
  Make requests for restricted networks not require unrestricted access.
This commit is contained in:
Lorenzo Colitti
2014-06-04 18:46:31 +00:00
committed by Android Git Automerger
parent 66dc60fe8f 74246df4e4
commit 97618013db
1 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
core/java/android/net/ConnectivityManager.java
View File

@@ -870,6 +870,26 @@ public class ConnectivityManager {
return 1; return 1;
} }
/**
* Removes the NET_CAPABILITY_NOT_RESTRICTED capability from the given
* NetworkCapabilities object if it lists any capabilities that are
* typically provided by retricted networks.
* @hide
*/
public static void maybeMarkCapabilitiesRestricted(NetworkCapabilities nc) {
for (Integer capability: nc.getNetworkCapabilities()) {
switch (capability.intValue()) {
case NetworkCapabilities.NET_CAPABILITY_CBS:
case NetworkCapabilities.NET_CAPABILITY_DUN:
case NetworkCapabilities.NET_CAPABILITY_FOTA:
case NetworkCapabilities.NET_CAPABILITY_IA:
case NetworkCapabilities.NET_CAPABILITY_IMS:
nc.removeNetworkCapability(NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED);
break;
}
}
}
private NetworkCapabilities networkCapabilitiesForFeature(int networkType, String feature) { private NetworkCapabilities networkCapabilitiesForFeature(int networkType, String feature) {
if (networkType == TYPE_MOBILE) { if (networkType == TYPE_MOBILE) {
int cap = -1; int cap = -1;
@@ -893,12 +913,14 @@ public class ConnectivityManager {
NetworkCapabilities netCap = new NetworkCapabilities(); NetworkCapabilities netCap = new NetworkCapabilities();
netCap.addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR); netCap.addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR);
netCap.addNetworkCapability(cap); netCap.addNetworkCapability(cap);
maybeMarkCapabilitiesRestricted(netCap);
return netCap; return netCap;
} else if (networkType == TYPE_WIFI) { } else if (networkType == TYPE_WIFI) {
if ("p2p".equals(feature)) { if ("p2p".equals(feature)) {
NetworkCapabilities netCap = new NetworkCapabilities(); NetworkCapabilities netCap = new NetworkCapabilities();
netCap.addTransportType(NetworkCapabilities.TRANSPORT_WIFI); netCap.addTransportType(NetworkCapabilities.TRANSPORT_WIFI);
netCap.addNetworkCapability(NetworkCapabilities.NET_CAPABILITY_WIFI_P2P); netCap.addNetworkCapability(NetworkCapabilities.NET_CAPABILITY_WIFI_P2P);
maybeMarkCapabilitiesRestricted(netCap);
return netCap; return netCap;
} }
} }