LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove the usage of NETID_UNSET from Vpn.java

Browse Source 
Modify Vpn#getNetId() to Vpn#getNetwork() and uses NETID_UNSET
when getNetwork() returns null in ConnectivityServiceTest.

Bug: 182963397
Test: atest FrameworksNetTests
Change-Id: I69d449705b1dc541287c72af8dc7705dc4733109
This commit is contained in:
lucaslin
2021-03-22 15:10:20 +08:00
committed by Lucas Lin
parent 12e02a3da5
commit 865b4f2ade
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1177,11 +1177,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;
@@ -1206,10 +1201,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());
@@ -9744,11 +9741,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)));
} }