From 08459a6a7dabe95fadd725b064924d9e6558ba98 Mon Sep 17 00:00:00 2001 From: lucaslin Date: Tue, 15 Oct 2019 17:13:45 +0800 Subject: [PATCH] Remove the network capabilities which are added twice Remove the network capabilities which are added twice in createDefaultNetworkCapabilitiesForUid() and createDefaultInternetRequestForTransport(). In the constructor of NetworkCapabilities, it will add the DEFAULT_CAPABILITIES which includes the NOT_RESTRICTED. Bug: 142370233 Test: 1. Build pass. 2. atest FrameworksNetTests Change-Id: I7159909aec8faa7f25cef94195bdaea0fea55840 --- services/core/java/com/android/server/ConnectivityService.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index e0f60b43f8..0bb72cb9d5 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); }