summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Lucas Lin <lucaslin@google.com> 2019-10-15 21:23:48 -0700
committer android-build-merger <android-build-merger@google.com> 2019-10-15 21:23:48 -0700
commit4c90111d113f86b2477bbfb53c4b5a009efff80b (patch)
tree605e030565ee5f04b574cf43078d7eaf0b7b2baf
parent510f917b944a995e2ff09980e342bbfd9a663529 (diff)
parent931234b451cf8b491c87d5c09c61f0f06cf44a98 (diff)
Merge "Remove the network capabilities which are added twice"
am: 931234b451 Change-Id: I884dd7720ef9ccf257dc49de11a24918c00fa0ca
-rw-r--r--services/core/java/com/android/server/ConnectivityService.java2
1 files changed, 0 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index e0f60b43f8c8..0bb72cb9d554 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -1149,7 +1149,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
private static NetworkCapabilities createDefaultNetworkCapabilitiesForUid(int uid) {
final NetworkCapabilities netCap = new NetworkCapabilities();
netCap.addCapability(NET_CAPABILITY_INTERNET);
- netCap.addCapability(NET_CAPABILITY_NOT_RESTRICTED);
netCap.removeCapability(NET_CAPABILITY_NOT_VPN);
netCap.setSingleUid(uid);
return netCap;
@@ -1159,7 +1158,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
int transportType, NetworkRequest.Type type) {
final NetworkCapabilities netCap = new NetworkCapabilities();
netCap.addCapability(NET_CAPABILITY_INTERNET);
- netCap.addCapability(NET_CAPABILITY_NOT_RESTRICTED);
if (transportType > -1) {
netCap.addTransportType(transportType);
}