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

Commit 543283a7 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 am: 37da1d0a 

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



Change-Id: I728eb462b45207b2205f6c1cd7c7bd870e3a337f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9854fb9a 37da1d0a

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 */,