Merge changes I4b135749,If4fcaa52 am: 576dad4673 am: cd4e6ae6d6

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

Change-Id: I31a2eda921b88ebe0c70492e39f4b448f6c91b93

3 files changed, 20 insertions, 24 deletions

diff --git a/services/core/java/com/android/server/VcnManagementService.java b/services/core/java/com/android/server/VcnManagementService.java
index ddcb82a58534..bcbd692a2f7d 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 */
diff --git a/services/core/java/com/android/server/vcn/UnderlyingNetworkTracker.java b/services/core/java/com/android/server/vcn/UnderlyingNetworkTracker.java
index 3c6bb647c515..3bdeec0c1d8e 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<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 6f63c4b2e153..0b72cd93e8b0 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<Integer> expectedSubIds) {
-        verifyNetworkRequestsRegistered(expectedSubIds, false /* expectTestMode */);
-    }
-
-    private void verifyNetworkRequestsRegistered(
-            Set<Integer> 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<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();
     }