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

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

Merge "Remove the usage of NETID_UNSET from Vpn.java" am: cf1dc9f2 

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

Change-Id: Ic50dee391e123b9e9debb8e77bac1f0499d939f1
parents de449945 cf1dc9f2

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

+6 −7
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.server.connectivity;



import static android.Manifest.permission.BIND_VPN_SERVICE;

import static android.net.ConnectivityManager.NETID_UNSET;

import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_METERED;

import static android.net.RouteInfo.RTN_THROW;

import static android.net.RouteInfo.RTN_UNREACHABLE;
@@ -1127,17 +1126,17 @@ public class Vpn { 
    }



    /**

     * Return netId of current running VPN network.

     * Return Network of current running VPN network.

     *

     * @return a netId if there is a running VPN network or NETID_UNSET if there is no running VPN

     * @return a Network if there is a running VPN network or null if there is no running VPN

     *         network or network is null.

     */

    public synchronized int getNetId() {

    public synchronized Network getNetwork() {

        final NetworkAgent agent = mNetworkAgent;

        if (null == agent) return NETID_UNSET;

        if (null == agent) return null;

        final Network network = agent.getNetwork();

        if (null == network) return NETID_UNSET;

        return network.getNetId();

        if (null == network) return null;

        return network;

    }



    private LinkProperties makeLinkProperties() {

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

+9 −9
Original line number Diff line number Diff line
@@ -1178,11 +1178,6 @@ public class ConnectivityServiceTest { 
            return (mMockNetworkAgent == null) ? null : mMockNetworkAgent.getNetwork();

        }













        @Override













        public int getNetId() {













            return (mMockNetworkAgent == null) ? NETID_UNSET : mMockNetworkAgent.getNetwork().netId;













        }



























        @Override















        public int getActiveVpnType() {















            return mVpnType;









@@ -1207,10 +1202,12 @@ public class ConnectivityServiceTest {













                    mNetworkCapabilities);















            mMockNetworkAgent.waitForIdle(TIMEOUT_MS);



























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













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













                    : mMockVpn.getNetwork().getNetId();













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















                    eq(toUidRangeStableParcels(uids)));















            verify(mMockNetd, never())













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













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















            mAgentRegistered = true;















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















            mNetworkCapabilities.set(mMockNetworkAgent.getNetworkCapabilities());










@@ -9802,11 +9799,14 @@ 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(mMockVpn.getNetId()),













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















                    eq(toUidRangeStableParcels(vpnRanges)));















        } else {













            inOrder.verify(mMockNetd, times(1)).networkRemoveUidRanges(eq(mMockVpn.getNetId()),













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















                    eq(toUidRangeStableParcels(vpnRanges)));















        }