summaryrefslogtreecommitdiffstats
path: root/core/java/android/net
diff options
context:
space:
mode:
authorRobert Greenwalt <rgreenwalt@google.com>2014-06-05 16:39:28 -0700
committerRobert Greenwalt <rgreenwalt@google.com>2014-06-05 23:59:48 +0000
commit9ac3dbe1ce68fba1af012112894d54c3024195f8 (patch)
treec900e6767772738f9dfc703732f8ae145f178245 /core/java/android/net
parentabfaf964a59a90f666d913ca7b5db1da31649246 (diff)
downloadframeworks_base-9ac3dbe1ce68fba1af012112894d54c3024195f8.zip
frameworks_base-9ac3dbe1ce68fba1af012112894d54c3024195f8.tar.gz
frameworks_base-9ac3dbe1ce68fba1af012112894d54c3024195f8.tar.bz2
Fix the marking of restricted network requests
Need to realized that the NOT_RESTRICTED bit is set by default, so if looking at what bits are set to decide if we want NOT_RESTRICTED cleared, we need to ignore the bit itself. bug:15456019 Change-Id: Iecae598f47ec7306d475e2262bb1c452ddf0fc75
Diffstat (limited to 'core/java/android/net')
-rw-r--r--core/java/android/net/ConnectivityManager.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java
index b96f166..59732ee 100644
--- a/core/java/android/net/ConnectivityManager.java
+++ b/core/java/android/net/ConnectivityManager.java
@@ -892,6 +892,7 @@ public class ConnectivityManager {
case NetworkCapabilities.NET_CAPABILITY_IMS:
case NetworkCapabilities.NET_CAPABILITY_RCS:
case NetworkCapabilities.NET_CAPABILITY_XCAP:
+ case NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED: //there by default
continue;
default:
// At least one capability usually provided by unrestricted