From fbb3787f53a901ef10e9047915a00254a3ce65dc Mon Sep 17 00:00:00 2001 From: lucaslin Date: Mon, 22 Mar 2021 19:15:51 +0800 Subject: [PATCH] Add annotation for Vpn#getNetwork() - 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 Merged-In: Ic52864003fbebd9f4e95d43fefc2e168437b0122 (cherry-picked from ag/13946573) --- .../com/android/server/connectivity/Vpn.java | 2 ++ .../android/server/ConnectivityServiceTest.java | 16 ++++++---------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/services/core/java/com/android/server/connectivity/Vpn.java b/services/core/java/com/android/server/connectivity/Vpn.java index 85c6ec1b3e7db..feccc1af197ad 100644 --- a/services/core/java/com/android/server/connectivity/Vpn.java +++ b/services/core/java/com/android/server/connectivity/Vpn.java @@ -1131,6 +1131,8 @@ public class Vpn { * @return a Network if there is a running VPN network or null if there is no running VPN * network or network is null. */ + @VisibleForTesting + @Nullable public synchronized Network getNetwork() { final NetworkAgent agent = mNetworkAgent; if (null == agent) return null; diff --git a/tests/net/java/com/android/server/ConnectivityServiceTest.java b/tests/net/java/com/android/server/ConnectivityServiceTest.java index 047685f992e2e..5f326077e5fea 100644 --- a/tests/net/java/com/android/server/ConnectivityServiceTest.java +++ b/tests/net/java/com/android/server/ConnectivityServiceTest.java @@ -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()); @@ -9798,14 +9795,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))); }