diff options
| author | Lucas Lin <lucaslin@google.com> | 2021-03-22 09:38:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-03-22 09:38:26 +0000 |
| commit | 385414ee283bca125ca3e73cb8f12ff485805fb5 (patch) | |
| tree | 39e80986f33928767b062898cb4d3f1341aa26a3 /tests/net/java/com/android/server/ConnectivityServiceTest.java | |
| parent | 15615ed0f28b51d138d4379e83ca057190202370 (diff) | |
| parent | 2cc371c74b53d05e5e828ecafc4b81ec69b9c11c (diff) | |
Merge "Remove the usage of NETID_UNSET from Vpn.java" into sc-dev
Diffstat (limited to 'tests/net/java/com/android/server/ConnectivityServiceTest.java')
| -rw-r--r-- | tests/net/java/com/android/server/ConnectivityServiceTest.java | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/net/java/com/android/server/ConnectivityServiceTest.java b/tests/net/java/com/android/server/ConnectivityServiceTest.java index 8a5014161d52..88f42c145c6e 100644 --- a/tests/net/java/com/android/server/ConnectivityServiceTest.java +++ b/tests/net/java/com/android/server/ConnectivityServiceTest.java @@ -1178,11 +1178,6 @@ public class ConnectivityServiceTest { } @Override - public int getNetId() { - return (mMockNetworkAgent == null) ? NETID_UNSET : mMockNetworkAgent.getNetwork().netId; - } - - @Override public int getActiveVpnType() { return mVpnType; } @@ -1206,10 +1201,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()); @@ -9745,11 +9742,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))); } |