LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Remove the network capabilities which are added twice"

Browse Source 
am: 931234b451

Change-Id: I884dd7720ef9ccf257dc49de11a24918c00fa0ca
This commit is contained in:
Lucas Lin
2019-10-15 21:23:48 -07:00
committed by android-build-merger
parent 5288706a9e 08459a6a7d
commit 210db2b411
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -1149,7 +1149,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
private static NetworkCapabilities createDefaultNetworkCapabilitiesForUid(int uid) { private static NetworkCapabilities createDefaultNetworkCapabilitiesForUid(int uid) {
final NetworkCapabilities netCap = new NetworkCapabilities(); final NetworkCapabilities netCap = new NetworkCapabilities();
netCap.addCapability(NET_CAPABILITY_INTERNET); netCap.addCapability(NET_CAPABILITY_INTERNET);
netCap.addCapability(NET_CAPABILITY_NOT_RESTRICTED);
netCap.removeCapability(NET_CAPABILITY_NOT_VPN); netCap.removeCapability(NET_CAPABILITY_NOT_VPN);
netCap.setSingleUid(uid); netCap.setSingleUid(uid);
return netCap; return netCap;
@@ -1159,7 +1158,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
int transportType, NetworkRequest.Type type) { int transportType, NetworkRequest.Type type) {
final NetworkCapabilities netCap = new NetworkCapabilities(); final NetworkCapabilities netCap = new NetworkCapabilities();
netCap.addCapability(NET_CAPABILITY_INTERNET); netCap.addCapability(NET_CAPABILITY_INTERNET);
netCap.addCapability(NET_CAPABILITY_NOT_RESTRICTED);
if (transportType > -1) { if (transportType > -1) {
netCap.addTransportType(transportType); netCap.addTransportType(transportType);
} }