Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37da1d0a authored by Yan Yan's avatar Yan Yan Committed by Automerger Merge Worker
Browse files

Merge "Remove hidden VcnTransportInfo methods from VpnTest" into main am: ad54f58a 

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



Change-Id: Ie442bf4630e9c48ef69c53fa75d9bced7c7b0d97
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 639f366a ad54f58a

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

+8 −4
Original line number Diff line number Diff line
@@ -2380,9 +2380,13 @@ public class VpnTest extends VpnTestBase { 
    @Test

    public void doTestMigrateIkeSession_Vcn() throws Exception {

        final int expectedKeepalive = 2097; // Any unlikely number will do

        final NetworkCapabilities vcnNc = new NetworkCapabilities.Builder()

        final NetworkCapabilities vcnNc =

                new NetworkCapabilities.Builder()

                        .addTransportType(TRANSPORT_CELLULAR)

                .setTransportInfo(new VcnTransportInfo(TEST_SUB_ID, expectedKeepalive))

                        .setTransportInfo(

                                new VcnTransportInfo.Builder()

                                        .setMinUdpPort4500NatTimeoutSeconds(expectedKeepalive)

                                        .build())

                        .build();

        final Ikev2VpnProfile ikev2VpnProfile = makeIkeV2VpnProfile(

                true /* isAutomaticIpVersionSelectionEnabled */,