Merge "Remove the network capabilities which are added twice" am: 931234b451
am: 210db2b411
Change-Id: Iad8268118899d21bf665d64b61e1cb1c4f49ca7e
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user