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

Commit 65eb4a43 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I6ec246a6,If7eb8857,Id3d12b23,Ia52f9caf,I21028457, ... into rvc-dev 

* changes:
  Fix legacy APIs when VPN switches to suspended underlying network.
  Backport test coverage from aosp/1547496.
  Backport some helpers in ConnectivityServiceTest.
  Test for bugs with suspended VPN underlying networks.
  Add a test for getDefaultNetworkCapabilitiesForUser.
  Improve testing of CONNECTIVITY_ACTION broadcasts.
  Test passing an underlying network array with null network in it.
  Make testVpnNetworkActive more deterministic.
  Make MockVpn more realistic and easier to use.
  Increase test coverage for VPN info sent to NetworkStatsService.
  Simplify MockVpn.
  Test a VPN with an underlying network that does not yet exist.
parents e75b4822 9d680e7c

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

+20 −13
Original line number Diff line number Diff line
@@ -6316,6 +6316,25 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        return newNc;

    }



    private void updateNetworkInfoForRoamingAndSuspended(NetworkAgentInfo nai,

            NetworkCapabilities prevNc, NetworkCapabilities newNc) {

        final boolean prevSuspended = !prevNc.hasCapability(NET_CAPABILITY_NOT_SUSPENDED);

        final boolean suspended = !newNc.hasCapability(NET_CAPABILITY_NOT_SUSPENDED);

        final boolean prevRoaming = !prevNc.hasCapability(NET_CAPABILITY_NOT_ROAMING);

        final boolean roaming = !newNc.hasCapability(NET_CAPABILITY_NOT_ROAMING);

        if (prevSuspended != suspended) {

            // TODO (b/73132094) : remove this call once the few users of onSuspended and

            // onResumed have been removed.

            notifyNetworkCallbacks(nai, suspended ? ConnectivityManager.CALLBACK_SUSPENDED

                    : ConnectivityManager.CALLBACK_RESUMED);

        }

        if (prevSuspended != suspended || prevRoaming != roaming) {

            // updateNetworkInfo will mix in the suspended info from the capabilities and

            // take appropriate action for the network having possibly changed state.

            updateNetworkInfo(nai, nai.networkInfo);

        }

    }



    /**

     * Update the NetworkCapabilities for {@code nai} to {@code nc}. Specifically:

     *
@@ -6347,25 +6366,13 @@ public class ConnectivityService extends IConnectivityManager.Stub 
            // on this network. We might have been called by rematchNetworkAndRequests when a

            // network changed foreground state.

            processListenRequests(nai);

            final boolean prevSuspended = !prevNc.hasCapability(NET_CAPABILITY_NOT_SUSPENDED);

            final boolean suspended = !newNc.hasCapability(NET_CAPABILITY_NOT_SUSPENDED);

            final boolean prevRoaming = !prevNc.hasCapability(NET_CAPABILITY_NOT_ROAMING);

            final boolean roaming = !newNc.hasCapability(NET_CAPABILITY_NOT_ROAMING);

            if (prevSuspended != suspended || prevRoaming != roaming) {

                // TODO (b/73132094) : remove this call once the few users of onSuspended and

                // onResumed have been removed.

                notifyNetworkCallbacks(nai, suspended ? ConnectivityManager.CALLBACK_SUSPENDED

                        : ConnectivityManager.CALLBACK_RESUMED);

                // updateNetworkInfo will mix in the suspended info from the capabilities and

                // take appropriate action for the network having possibly changed state.

                updateNetworkInfo(nai, nai.networkInfo);

            }

        } else {

            // If the requestable capabilities have changed or the score changed, we can't have been

            // called by rematchNetworkAndRequests, so it's safe to start a rematch.

            rematchAllNetworksAndRequests();

            notifyNetworkCallbacks(nai, ConnectivityManager.CALLBACK_CAP_CHANGED);

        }

        updateNetworkInfoForRoamingAndSuspended(nai, prevNc, newNc);



        // TODO : static analysis indicates that prevNc can't be null here (getAndSetNetworkCaps

        // never returns null), so mark the relevant members and functions in nai as @NonNull and

services/core/java/com/android/server/connectivity/Vpn.java

+2 −1
Original line number Diff line number Diff line
@@ -194,7 +194,8 @@ public class Vpn { 
    @VisibleForTesting protected String mPackage;

    private int mOwnerUID;

    private boolean mIsPackageTargetingAtLeastQ;

    private String mInterface;

    @VisibleForTesting

    protected String mInterface;

    private Connection mConnection;



    /** Tracks the runners for all VPN types managed by the platform (eg. LegacyVpn, PlatformVpn) */

tests/net/integration/src/com/android/server/net/integrationtests/ConnectivityServiceIntegrationTest.kt

+3 −2
Original line number Diff line number Diff line
@@ -195,7 +195,8 @@ class ConnectivityServiceIntegrationTest { 
                "https://secure.test.android.com",

                responseCode = 204, contentLength = 42, redirectUrl = null))



        val na = NetworkAgentWrapper(TRANSPORT_CELLULAR, LinkProperties(), context)

        val na = NetworkAgentWrapper(TRANSPORT_CELLULAR, LinkProperties(), null /* ncTemplate */,

                context)

        networkStackClient.verifyNetworkMonitorCreated(na.network, TEST_TIMEOUT_MS)



        na.addCapability(NET_CAPABILITY_INTERNET)

tests/net/integration/util/com/android/server/NetworkAgentWrapper.java

+3 −3
Original line number Diff line number Diff line
@@ -69,12 +69,12 @@ public class NetworkAgentWrapper implements TestableNetworkCallback.HasNetwork { 
    private int mStopKeepaliveError = SocketKeepalive.NO_KEEPALIVE;

    private Integer mExpectedKeepaliveSlot = null;



    public NetworkAgentWrapper(int transport, LinkProperties linkProperties, Context context)

            throws Exception {

    public NetworkAgentWrapper(int transport, LinkProperties linkProperties,

            NetworkCapabilities ncTemplate, Context context) throws Exception {

        final int type = transportToLegacyType(transport);

        final String typeName = ConnectivityManager.getNetworkTypeName(type);

        mNetworkInfo = new NetworkInfo(type, 0, typeName, "Mock");

        mNetworkCapabilities = new NetworkCapabilities();

        mNetworkCapabilities = (ncTemplate != null) ? ncTemplate : new NetworkCapabilities();

        mNetworkCapabilities.addCapability(NET_CAPABILITY_NOT_SUSPENDED);

        mNetworkCapabilities.addTransportType(transport);

        switch (transport) {

tests/net/integration/util/com/android/server/TestNetIdManager.kt

+1 −0
Original line number Diff line number Diff line
@@ -35,4 +35,5 @@ class TestNetIdManager : NetIdManager() { 
    private val nextId = AtomicInteger(MAX_NET_ID)

    override fun reserveNetId() = nextId.decrementAndGet()

    override fun releaseNetId(id: Int) = Unit

    fun peekNextNetId() = nextId.get() - 1

}