Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 931234b4 authored by Lucas Lin's avatar Lucas Lin Committed by Gerrit Code Review
Browse files

Merge "Remove the network capabilities which are added twice"

parents 15ddba32 3302cfc6

services/core/java/com/android/server/ConnectivityService.java

+0 −2
Original line number Diff line number Diff line
@@ -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);

        }