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

Commit 69de2142 authored by Lucas Lin's avatar Lucas Lin Committed by android-build-merger
Browse files

Merge "Remove the network capabilities which are added twice" am: 931234b4 am: 4c90111d 

am: eb9542bd

Change-Id: Ifea6d9380bfbfeb3ca5a35874c51fd1f5fdef6b0
parents 63bb8561 eb9542bd

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

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

        }

        }