Merge changes I4b135749,If4fcaa52
* changes:
Restructure Test Network requests for VCN connections.
Correct variable name in VcnManagementService.
diff --git a/services/core/java/com/android/server/VcnManagementService.java b/services/core/java/com/android/server/VcnManagementService.java
index ddcb82a..bcbd692 100644
--- a/services/core/java/com/android/server/VcnManagementService.java
+++ b/services/core/java/com/android/server/VcnManagementService.java
@@ -335,8 +335,8 @@
@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 */
diff --git a/services/core/java/com/android/server/vcn/UnderlyingNetworkTracker.java b/services/core/java/com/android/server/vcn/UnderlyingNetworkTracker.java
index 3c6bb64..3bdeec0 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 @@
/** Builds and returns a NetworkRequest for the given subIds to match Test Networks. */
private NetworkRequest getTestNetworkRequest(@NonNull Set<Integer> 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 6f63c4b..0b72cd9 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 @@
@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<Integer> expectedSubIds) {
- verifyNetworkRequestsRegistered(expectedSubIds, false /* expectTestMode */);
- }
-
- private void verifyNetworkRequestsRegistered(
- Set<Integer> expectedSubIds, boolean expectTestMode) {
verify(mConnectivityManager)
.requestBackgroundNetwork(
eq(getWifiRequest(expectedSubIds)),
@@ -196,14 +199,9 @@
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 @@
}
private NetworkRequest getTestNetworkRequest(Set<Integer> 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();
}