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

Commit 411e79b8 authored by Chalard Jean's avatar Chalard Jean Committed by Android (Google) Code Review
Browse files

Merge changes I0cd83a93,I03ae2bbb into pi-dev 

* changes:
  Make sure getActiveNetwork is consistent with default callbacks
  Add tests for getActiveNetwork.
parents 53790c1c 26400490

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

+26 −7
Original line number Diff line number Diff line
@@ -238,8 +238,9 @@ public class ConnectivityService extends IConnectivityManager.Stub 


    private KeyStore mKeyStore;



    @VisibleForTesting

    @GuardedBy("mVpns")

    private final SparseArray<Vpn> mVpns = new SparseArray<Vpn>();

    protected final SparseArray<Vpn> mVpns = new SparseArray<Vpn>();



    // TODO: investigate if mLockdownEnabled can be removed and replaced everywhere by

    // a direct call to LockdownVpnTracker.isEnabled().
@@ -929,6 +930,15 @@ public class ConnectivityService extends IConnectivityManager.Stub 
                deps);

    }



    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;

    }



    private NetworkRequest createDefaultInternetRequestForTransport(

            int transportType, NetworkRequest.Type type) {

        NetworkCapabilities netCap = new NetworkCapabilities();
@@ -1181,12 +1191,20 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        int vpnNetId = NETID_UNSET;

        synchronized (mVpns) {

            final Vpn vpn = mVpns.get(user);

            // TODO : now that capabilities contain the UID, the appliesToUid test should

            // be removed as the satisfying test below should be enough.

            if (vpn != null && vpn.appliesToUid(uid)) vpnNetId = vpn.getNetId();

        }

        NetworkAgentInfo nai;

        if (vpnNetId != NETID_UNSET) {

            nai = getNetworkAgentInfoForNetId(vpnNetId);

            if (nai != null) return nai.network;

            if (nai != null) {

                final NetworkCapabilities requiredCaps =

                    createDefaultNetworkCapabilitiesForUid(uid);

                if (requiredCaps.satisfiedByNetworkCapabilities(nai.networkCapabilities)) {

                    return nai.network;

                }

            }

        }

        nai = getDefaultNetwork();

        if (nai != null
@@ -1401,8 +1419,10 @@ public class ConnectivityService extends IConnectivityManager.Stub 
    private NetworkCapabilities networkCapabilitiesRestrictedForCallerPermissions(

            NetworkCapabilities nc, int callerPid, int callerUid) {

        final NetworkCapabilities newNc = new NetworkCapabilities(nc);

        if (!checkSettingsPermission(callerPid, callerUid)) newNc.setUids(null);

        if (!checkSettingsPermission(callerPid, callerUid)) newNc.setSSID(null);

        if (!checkSettingsPermission(callerPid, callerUid)) {

            newNc.setUids(null);

            newNc.setSSID(null);

        }

        return newNc;

    }
@@ -4304,8 +4324,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        // the default network request. This allows callers to keep track of

        // the system default network.

        if (type == NetworkRequest.Type.TRACK_DEFAULT) {

            networkCapabilities = new NetworkCapabilities(mDefaultRequest.networkCapabilities);

            networkCapabilities.removeCapability(NET_CAPABILITY_NOT_VPN);

            networkCapabilities = createDefaultNetworkCapabilitiesForUid(Binder.getCallingUid());

            enforceAccessPermission();

        } else {

            networkCapabilities = new NetworkCapabilities(networkCapabilities);

tests/net/java/com/android/server/ConnectivityServiceTest.java

+137 −4

File changed.

Preview size limit exceeded, changes collapsed.