diff options
| author | 2019-10-15 21:41:47 -0700 | |
|---|---|---|
| committer | 2019-10-15 21:41:47 -0700 | |
| commit | eb9542bdd7f555a34290d82b7c9b1fb821302a1b (patch) | |
| tree | 99dd89fcef0c635fde1122bc6be25f42b2e24054 | |
| parent | 27b61580fe762c54845dd6ddf3e01562629918de (diff) | |
| parent | 4c90111d113f86b2477bbfb53c4b5a009efff80b (diff) | |
Merge "Remove the network capabilities which are added twice" am: 931234b451
am: 4c90111d11
Change-Id: Iad8268118899d21bf665d64b61e1cb1c4f49ca7e
| -rw-r--r-- | services/core/java/com/android/server/ConnectivityService.java | 2 |
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); } |