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

Commit 7a834426 authored by Lucas Lin's avatar Lucas Lin Committed by Automerger Merge Worker
Browse files

Merge "Add annotation for Vpn#getNetwork()" into sc-dev am: 0abe7327 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13946573

Change-Id: If5f38eaa5c60c5ef3ed9bd621e46f6813e6ff280
parents e8a9d666 0abe7327

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

+2 −0
Original line number Diff line number Diff line
@@ -1133,6 +1133,8 @@ public class Vpn { 
     * @return a Network if there is a running VPN network or null if there is no running VPN

     *         network or network is null.

     */

    @VisibleForTesting

    @Nullable

    public synchronized Network getNetwork() {

        final NetworkAgent agent = mNetworkAgent;

        if (null == agent) return null;

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

+6 −10
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ import static android.net.ConnectivityManager.ACTION_CAPTIVE_PORTAL_SIGN_IN; 
import static android.net.ConnectivityManager.CONNECTIVITY_ACTION;

import static android.net.ConnectivityManager.EXTRA_NETWORK_INFO;

import static android.net.ConnectivityManager.EXTRA_NETWORK_TYPE;

import static android.net.ConnectivityManager.NETID_UNSET;

import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_OFF;

import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_OPPORTUNISTIC;

import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_PROVIDER_HOSTNAME;
@@ -1201,12 +1200,10 @@ public class ConnectivityServiceTest { 
                    mNetworkCapabilities);

            mMockNetworkAgent.waitForIdle(TIMEOUT_MS);













            final int expectedNetId = mMockVpn.getNetwork() == null ? NETID_UNSET













                    : mMockVpn.getNetwork().getNetId();













            verify(mMockNetd, times(1)).networkAddUidRanges(eq(expectedNetId),













            verify(mMockNetd, times(1)).networkAddUidRanges(eq(mMockVpn.getNetwork().getNetId()),















                    eq(toUidRangeStableParcels(uids)));















            verify(mMockNetd, never())













                    .networkRemoveUidRanges(eq(expectedNetId), any());













                    .networkRemoveUidRanges(eq(mMockVpn.getNetwork().getNetId()), any());















            mAgentRegistered = true;















            updateState(NetworkInfo.DetailedState.CONNECTED, "registerAgent");















            mNetworkCapabilities.set(mMockNetworkAgent.getNetworkCapabilities());










@@ -9799,14 +9796,13 @@ public class ConnectivityServiceTest {













                exemptUidCaptor.capture());















        assertContainsExactly(exemptUidCaptor.getValue(), Process.VPN_UID, exemptUid);



























        final int expectedNetId = mMockVpn.getNetwork() == null ? NETID_UNSET













                : mMockVpn.getNetwork().getNetId();



























        if (add) {













            inOrder.verify(mMockNetd, times(1)).networkAddUidRanges(eq(expectedNetId),













            inOrder.verify(mMockNetd, times(1))













                    .networkAddUidRanges(eq(mMockVpn.getNetwork().getNetId()),















                    eq(toUidRangeStableParcels(vpnRanges)));















        } else {













            inOrder.verify(mMockNetd, times(1)).networkRemoveUidRanges(eq(expectedNetId),













            inOrder.verify(mMockNetd, times(1))













                    .networkRemoveUidRanges(eq(mMockVpn.getNetwork().getNetId()),















                    eq(toUidRangeStableParcels(vpnRanges)));















        }