commit ad54f58a7d670233d57a862955ee238dcadbe4c6
author Yan Yan <evitayan@google.com> Thu Nov 14 06:09:55 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Nov 14 06:09:55 2024 +0000
tree acd048580e4e619ca10e0af582cdb40a3ff94620
parent 59a332c5021e16db23abe63a4fb950760b7e3d68
parent fb0fc8a50bd266716617a2a9e316285002504b3b

Merge "Remove hidden VcnTransportInfo methods from VpnTest" into main

services/tests/VpnTests/java/com/android/server/connectivity/VpnTest.java

diff --git a/services/tests/VpnTests/java/com/android/server/connectivity/VpnTest.java b/services/tests/VpnTests/java/com/android/server/connectivity/VpnTest.java
index 08155c7..9772ef9 100644
--- a/services/tests/VpnTests/java/com/android/server/connectivity/VpnTest.java
+++ b/services/tests/VpnTests/java/com/android/server/connectivity/VpnTest.java
@@ -2380,10 +2380,14 @@
     @Test
     public void doTestMigrateIkeSession_Vcn() throws Exception {
         final int expectedKeepalive = 2097; // Any unlikely number will do
-        final NetworkCapabilities vcnNc = new NetworkCapabilities.Builder()
-                .addTransportType(TRANSPORT_CELLULAR)
-                .setTransportInfo(new VcnTransportInfo(TEST_SUB_ID, expectedKeepalive))
-                .build();
+        final NetworkCapabilities vcnNc =
+                new NetworkCapabilities.Builder()
+                        .addTransportType(TRANSPORT_CELLULAR)
+                        .setTransportInfo(
+                                new VcnTransportInfo.Builder()
+                                        .setMinUdpPort4500NatTimeoutSeconds(expectedKeepalive)
+                                        .build())
+                        .build();
         final Ikev2VpnProfile ikev2VpnProfile = makeIkeV2VpnProfile(
                 true /* isAutomaticIpVersionSelectionEnabled */,
                 true /* isAutomaticNattKeepaliveTimerEnabled */,