From 48f54d8faee6fc97e3e6863275141f0e32b3008b Mon Sep 17 00:00:00 2001 From: Cody Kesting Date: Tue, 11 May 2021 18:34:51 -0700 Subject: [PATCH 1/2] Correct variable name in VcnManagementService. Bug: 182291467 Test: atest FrameworksVcnTests CtsVcnTestCases Change-Id: If4fcaa523e5cac85c916f7c41cef996129652a5d --- .../core/java/com/android/server/VcnManagementService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/VcnManagementService.java b/services/core/java/com/android/server/VcnManagementService.java index b49b77c8998ea..34d8a46842a1b 100644 --- a/services/core/java/com/android/server/VcnManagementService.java +++ b/services/core/java/com/android/server/VcnManagementService.java @@ -335,8 +335,8 @@ public class VcnManagementService extends IVcnManagementService.Stub { @NonNull Context context, @NonNull Looper looper, @NonNull VcnNetworkProvider vcnNetworkProvider, - boolean getIsInTestMode) { - return new VcnContext(context, looper, vcnNetworkProvider, getIsInTestMode); + boolean isInTestMode) { + return new VcnContext(context, looper, vcnNetworkProvider, isInTestMode); } /** Creates a new Vcn instance using the provided configuration */ From da188b371982968426fe8b5e3bffadff59b6b6d4 Mon Sep 17 00:00:00 2001 From: Cody Kesting Date: Tue, 11 May 2021 19:17:54 -0700 Subject: [PATCH 2/2] Restructure Test Network requests for VCN connections. This CL restructures the NetworkRequests used for TestNetworks in UnderlyingNetworkTracker to clearly show that they only require TRANSPORT_TEST and the relevant subIds. Bug: 182291467 Test: atest FrameworksVcnTests CtsVcnTestCases Change-Id: I4b135749fdde9f91c66b87b1ded921700e6440fd --- .../server/vcn/UnderlyingNetworkTracker.java | 5 ++- .../vcn/UnderlyingNetworkTrackerTest.java | 35 +++++++++---------- 2 files changed, 18 insertions(+), 22 deletions(-) diff --git a/services/core/java/com/android/server/vcn/UnderlyingNetworkTracker.java b/services/core/java/com/android/server/vcn/UnderlyingNetworkTracker.java index 3c6bb647c5153..3bdeec0c1d8e0 100644 --- a/services/core/java/com/android/server/vcn/UnderlyingNetworkTracker.java +++ b/services/core/java/com/android/server/vcn/UnderlyingNetworkTracker.java @@ -219,10 +219,9 @@ public class UnderlyingNetworkTracker { /** Builds and returns a NetworkRequest for the given subIds to match Test Networks. */ private NetworkRequest getTestNetworkRequest(@NonNull Set subIds) { - return getBaseNetworkRequestBuilder() + return new NetworkRequest.Builder() + .clearCapabilities() .addTransportType(NetworkCapabilities.TRANSPORT_TEST) - .removeCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) - .removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN) .setSubscriptionIds(subIds) .build(); } diff --git a/tests/vcn/java/com/android/server/vcn/UnderlyingNetworkTrackerTest.java b/tests/vcn/java/com/android/server/vcn/UnderlyingNetworkTrackerTest.java index 6f63c4b2e1533..0b72cd93e8b09 100644 --- a/tests/vcn/java/com/android/server/vcn/UnderlyingNetworkTrackerTest.java +++ b/tests/vcn/java/com/android/server/vcn/UnderlyingNetworkTrackerTest.java @@ -163,27 +163,30 @@ public class UnderlyingNetworkTrackerTest { @Test public void testNetworkCallbacksRegisteredOnStartupForTestMode() { - resetVcnContext(); - when(mVcnContext.isInTestMode()).thenReturn(true); - reset(mConnectivityManager); + final VcnContext vcnContext = + spy( + new VcnContext( + mContext, + mTestLooper.getLooper(), + mVcnNetworkProvider, + true /* isInTestMode */)); mUnderlyingNetworkTracker = new UnderlyingNetworkTracker( - mVcnContext, + vcnContext, SUB_GROUP, mSubscriptionSnapshot, Collections.singleton(NetworkCapabilities.NET_CAPABILITY_INTERNET), mNetworkTrackerCb); - verifyNetworkRequestsRegistered(INITIAL_SUB_IDS, true /* expectTestMode */); + verify(mConnectivityManager) + .requestBackgroundNetwork( + eq(getTestNetworkRequest(INITIAL_SUB_IDS)), + any(RouteSelectionCallback.class), + any()); } private void verifyNetworkRequestsRegistered(Set expectedSubIds) { - verifyNetworkRequestsRegistered(expectedSubIds, false /* expectTestMode */); - } - - private void verifyNetworkRequestsRegistered( - Set expectedSubIds, boolean expectTestMode) { verify(mConnectivityManager) .requestBackgroundNetwork( eq(getWifiRequest(expectedSubIds)), @@ -196,14 +199,9 @@ public class UnderlyingNetworkTrackerTest { any(NetworkBringupCallback.class), any()); } - final NetworkRequest expectedRouteSelectionRequest = - expectTestMode - ? getTestNetworkRequest(expectedSubIds) - : getRouteSelectionRequest(expectedSubIds); - verify(mConnectivityManager) .requestBackgroundNetwork( - eq(expectedRouteSelectionRequest), + eq(getRouteSelectionRequest(expectedSubIds)), any(RouteSelectionCallback.class), any()); } @@ -245,10 +243,9 @@ public class UnderlyingNetworkTrackerTest { } private NetworkRequest getTestNetworkRequest(Set netCapsSubIds) { - return getExpectedRequestBase() + return new NetworkRequest.Builder() + .clearCapabilities() .addTransportType(NetworkCapabilities.TRANSPORT_TEST) - .removeCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) - .removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN) .setSubscriptionIds(netCapsSubIds) .build(); }