summaryrefslogtreecommitdiffstats
path: root/core/java/android/net
diff options
context:
space:
mode:
authorRobert Greenwalt <rgreenwalt@google.com>2014-06-08 16:07:39 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-06-08 16:07:40 +0000
commit915c8d58414cb9c2dd97459cacf9eefbe22267a1 (patch)
treefeb866342e9acf9d84b4641329ff9a0c3e753353 /core/java/android/net
parent8b5dd8c5d4231bebb97466283955790149fc28a0 (diff)
parent9ac3dbe1ce68fba1af012112894d54c3024195f8 (diff)
downloadframeworks_base-915c8d58414cb9c2dd97459cacf9eefbe22267a1.zip
frameworks_base-915c8d58414cb9c2dd97459cacf9eefbe22267a1.tar.gz
frameworks_base-915c8d58414cb9c2dd97459cacf9eefbe22267a1.tar.bz2
Merge "Fix the marking of restricted network requests"
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