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

Commit 53661b61 authored by Nagendra Prasad Nagarle Basavaraju's avatar Nagendra Prasad Nagarle Basavaraju Committed by Automerger Merge Worker
Browse files

Merge "Support encoding/decoding IkeSessionParams with... 

Merge "Support encoding/decoding IkeSessionParams with IKE_OPTION_INITIAL_CONTACT" am: 839597de am: b816eaa3 am: ed6d6ca4

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

Change-Id: I7f58c7a096592576789e2cbcb56d940053d6222c
parents 81b45aac ed6d6ca4

core/java/android/net/vcn/persistablebundleutils/IkeSessionParamsUtils.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -79,6 +79,7 @@ public final class IkeSessionParamsUtils { 
        IKE_OPTIONS.add(IkeSessionParams.IKE_OPTION_EAP_ONLY_AUTH);

        IKE_OPTIONS.add(IkeSessionParams.IKE_OPTION_EAP_ONLY_AUTH);

        IKE_OPTIONS.add(IkeSessionParams.IKE_OPTION_MOBIKE);

        IKE_OPTIONS.add(IkeSessionParams.IKE_OPTION_MOBIKE);

        IKE_OPTIONS.add(IkeSessionParams.IKE_OPTION_FORCE_PORT_4500);

        IKE_OPTIONS.add(IkeSessionParams.IKE_OPTION_FORCE_PORT_4500);

        IKE_OPTIONS.add(IkeSessionParams.IKE_OPTION_INITIAL_CONTACT);

    }

    }





    /** Serializes an IkeSessionParams to a PersistableBundle. */

    /** Serializes an IkeSessionParams to a PersistableBundle. */

tests/vcn/java/android/net/vcn/persistablebundleutils/IkeSessionParamsUtilsTest.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -135,11 +135,12 @@ public class IkeSessionParamsUtilsTest { 
    }

    }





    @Test

    @Test

    public void testEncodeRecodeParamsWithIkeOptions() throws Exception {

    public void testEncodeDecodeParamsWithIkeOptions() throws Exception {

        final IkeSessionParams params =

        final IkeSessionParams params =

                createBuilderMinimum()

                createBuilderMinimum()

                        .addIkeOption(IkeSessionParams.IKE_OPTION_ACCEPT_ANY_REMOTE_ID)

                        .addIkeOption(IkeSessionParams.IKE_OPTION_ACCEPT_ANY_REMOTE_ID)

                        .addIkeOption(IkeSessionParams.IKE_OPTION_MOBIKE)

                        .addIkeOption(IkeSessionParams.IKE_OPTION_MOBIKE)

                        .addIkeOption(IkeSessionParams.IKE_OPTION_INITIAL_CONTACT)

                        .build();

                        .build();

        verifyPersistableBundleEncodeDecodeIsLossless(params);

        verifyPersistableBundleEncodeDecodeIsLossless(params);

    }

    }