Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove the usage of NETID_UNSET from Vpn.java"

Browse Source
This commit is contained in:
Lucas Lin
2021-03-25 11:29:17 +00:00
committed by Gerrit Code Review
parent f43adf215e 737100e979
commit cf1dc9f287
2 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/core/java/com/android/server/connectivity/Vpn.java
View File

@@ -17,7 +17,6 @@
package com.android.server.connectivity; package com.android.server.connectivity;
import static android.Manifest.permission.BIND_VPN_SERVICE; 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.NetworkCapabilities.NET_CAPABILITY_NOT_METERED;
import static android.net.RouteInfo.RTN_THROW; import static android.net.RouteInfo.RTN_THROW;
import static android.net.RouteInfo.RTN_UNREACHABLE; 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. * network or network is null.
*/ */
public synchronized int getNetId() { public synchronized Network getNetwork() {
final NetworkAgent agent = mNetworkAgent; final NetworkAgent agent = mNetworkAgent;
if (null == agent) return NETID_UNSET; if (null == agent) return null;
final Network network = agent.getNetwork(); final Network network = agent.getNetwork();
if (null == network) return NETID_UNSET; if (null == network) return null;
return network.getNetId(); return network;
} }
private LinkProperties makeLinkProperties() { private LinkProperties makeLinkProperties() {

18
tests/net/java/com/android/server/ConnectivityServiceTest.java
View File

@@ -1178,11 +1178,6 @@ public class ConnectivityServiceTest {
return (mMockNetworkAgent == null) ? null : mMockNetworkAgent.getNetwork(); return (mMockNetworkAgent == null) ? null : mMockNetworkAgent.getNetwork();
} }
@Override
public int getNetId() {
return (mMockNetworkAgent == null) ? NETID_UNSET : mMockNetworkAgent.getNetwork().netId;
}
@Override @Override
public int getActiveVpnType() { public int getActiveVpnType() {
return mVpnType; return mVpnType;
@@ -1207,10 +1202,12 @@ public class ConnectivityServiceTest {
mNetworkCapabilities); mNetworkCapabilities);
mMockNetworkAgent.waitForIdle(TIMEOUT_MS); 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))); eq(toUidRangeStableParcels(uids)));
verify(mMockNetd, never()) verify(mMockNetd, never())
.networkRemoveUidRanges(eq(mMockVpn.getNetId()), any()); .networkRemoveUidRanges(eq(expectedNetId), any());
mAgentRegistered = true; mAgentRegistered = true;
updateState(NetworkInfo.DetailedState.CONNECTED, "registerAgent"); updateState(NetworkInfo.DetailedState.CONNECTED, "registerAgent");
mNetworkCapabilities.set(mMockNetworkAgent.getNetworkCapabilities()); mNetworkCapabilities.set(mMockNetworkAgent.getNetworkCapabilities());
@@ -9802,11 +9799,14 @@ public class ConnectivityServiceTest {
exemptUidCaptor.capture()); exemptUidCaptor.capture());
assertContainsExactly(exemptUidCaptor.getValue(), Process.VPN_UID, exemptUid); assertContainsExactly(exemptUidCaptor.getValue(), Process.VPN_UID, exemptUid);
final int expectedNetId = mMockVpn.getNetwork() == null ? NETID_UNSET
: mMockVpn.getNetwork().getNetId();
if (add) { if (add) {
inOrder.verify(mMockNetd, times(1)).networkAddUidRanges(eq(mMockVpn.getNetId()), inOrder.verify(mMockNetd, times(1)).networkAddUidRanges(eq(expectedNetId),
eq(toUidRangeStableParcels(vpnRanges))); eq(toUidRangeStableParcels(vpnRanges)));
} else { } else {
inOrder.verify(mMockNetd, times(1)).networkRemoveUidRanges(eq(mMockVpn.getNetId()), inOrder.verify(mMockNetd, times(1)).networkRemoveUidRanges(eq(expectedNetId),
eq(toUidRangeStableParcels(vpnRanges))); eq(toUidRangeStableParcels(vpnRanges)));
} }