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

Add annotation for Vpn#getNetwork()

Browse Source 
- Add @VisibleForTesting & @Nullable for Vpn#getNetwork().
- Remove null check in caller side(test) of Vpn#getNetwork()
because if the code is working properly, it can never be null.

Bug: 182963397
Test: atest FrameworksNetTests
Change-Id: Ic52864003fbebd9f4e95d43fefc2e168437b0122
This commit is contained in:
lucaslin
2021-03-22 19:15:51 +08:00
parent def33143e8
commit 2e4bc41b5b
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

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