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

Commit fb0fc8a5 authored by Yan Yan's avatar Yan Yan
Browse files

Remove hidden VcnTransportInfo methods from VpnTest 

VCN will be moved to a mainline module and the constructor will
not be accessible to VpnTest anymore. This commit updates VpnTest
to use the Builder that will be exposed as SystemApi

Bug: 369710077
Test: presubmit
Flag: EXEMPT pure refactoring
Change-Id: I6217c8312140b51ebe746c5fe0b12a5ced428f6c
parent 4b79951f

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