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

Merge "Add annotation for Vpn#getNetwork()" am: 3483ccf883 am: b4ac20f26b

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

Change-Id: Iaad97aa7b05f7583fc740d0bdaeffd8f23566086
This commit is contained in:
Lucas Lin
2021-03-25 12:39:43 +00:00
committed by Automerger Merge Worker
parent 82131f1f82 b4ac20f26b
commit 4b44bfce87
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,7 +37,6 @@ import static android.net.ConnectivityManager.BLOCKED_REASON_NONE;
import static android.net.ConnectivityManager.CONNECTIVITY_ACTION; import static android.net.ConnectivityManager.CONNECTIVITY_ACTION;
import static android.net.ConnectivityManager.EXTRA_NETWORK_INFO; import static android.net.ConnectivityManager.EXTRA_NETWORK_INFO;
import static android.net.ConnectivityManager.EXTRA_NETWORK_TYPE; 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_OFF;
import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_OPPORTUNISTIC; import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_OPPORTUNISTIC;
import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_PROVIDER_HOSTNAME; import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_PROVIDER_HOSTNAME;
@@ -1202,12 +1201,10 @@ public class ConnectivityServiceTest {
mNetworkCapabilities); mNetworkCapabilities);
mMockNetworkAgent.waitForIdle(TIMEOUT_MS); mMockNetworkAgent.waitForIdle(TIMEOUT_MS);
final int expectedNetId = mMockVpn.getNetwork() == null ? NETID_UNSET verify(mMockNetd, times(1)).networkAddUidRanges(eq(mMockVpn.getNetwork().getNetId()),
: mMockVpn.getNetwork().getNetId();
verify(mMockNetd, times(1)).networkAddUidRanges(eq(expectedNetId),
eq(toUidRangeStableParcels(uids))); eq(toUidRangeStableParcels(uids)));
verify(mMockNetd, never()) verify(mMockNetd, never())
.networkRemoveUidRanges(eq(expectedNetId), any()); .networkRemoveUidRanges(eq(mMockVpn.getNetwork().getNetId()), any());
mAgentRegistered = true; mAgentRegistered = true;
updateState(NetworkInfo.DetailedState.CONNECTED, "registerAgent"); updateState(NetworkInfo.DetailedState.CONNECTED, "registerAgent");
mNetworkCapabilities.set(mMockNetworkAgent.getNetworkCapabilities()); mNetworkCapabilities.set(mMockNetworkAgent.getNetworkCapabilities());
@@ -9799,14 +9796,13 @@ 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(expectedNetId), inOrder.verify(mMockNetd, times(1))
.networkAddUidRanges(eq(mMockVpn.getNetwork().getNetId()),
eq(toUidRangeStableParcels(vpnRanges))); eq(toUidRangeStableParcels(vpnRanges)));
} else { } else {
inOrder.verify(mMockNetd, times(1)).networkRemoveUidRanges(eq(expectedNetId), inOrder.verify(mMockNetd, times(1))
.networkRemoveUidRanges(eq(mMockVpn.getNetwork().getNetId()),
eq(toUidRangeStableParcels(vpnRanges))); eq(toUidRangeStableParcels(vpnRanges)));
} }