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

Commit 3cac9278 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Gerrit Code Review
Browse files

Merge "Add new IKE option in IkeSessionParamsUtils"

parents f4540227 48fce49a

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

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

        IKE_OPTIONS.add(IkeSessionParams.IKE_OPTION_REKEY_MOBILITY);

        IKE_OPTIONS.add(IKE_OPTION_AUTOMATIC_ADDRESS_FAMILY_SELECTION);

        IKE_OPTIONS.add(IKE_OPTION_AUTOMATIC_ADDRESS_FAMILY_SELECTION);

        IKE_OPTIONS.add(IKE_OPTION_AUTOMATIC_NATT_KEEPALIVES);

        IKE_OPTIONS.add(IKE_OPTION_AUTOMATIC_NATT_KEEPALIVES);

        IKE_OPTIONS.add(IkeSessionParams.IKE_OPTION_AUTOMATIC_KEEPALIVE_ON_OFF);

    }

    }





    /**

    /**

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

+6 −8
Original line number Original line Diff line number Diff line
@@ -16,9 +16,9 @@ 




package android.net.vcn.persistablebundleutils;

package android.net.vcn.persistablebundleutils;





import static android.net.ipsec.ike.IkeSessionParams.IKE_OPTION_AUTOMATIC_KEEPALIVE_ON_OFF;

import static android.net.vcn.persistablebundleutils.IkeSessionParamsUtils.IKE_OPTION_AUTOMATIC_ADDRESS_FAMILY_SELECTION;

import static android.net.vcn.persistablebundleutils.IkeSessionParamsUtils.IKE_OPTION_AUTOMATIC_ADDRESS_FAMILY_SELECTION;

import static android.net.vcn.persistablebundleutils.IkeSessionParamsUtils.IKE_OPTION_AUTOMATIC_NATT_KEEPALIVES;

import static android.net.vcn.persistablebundleutils.IkeSessionParamsUtils.IKE_OPTION_AUTOMATIC_NATT_KEEPALIVES;

import static android.net.vcn.persistablebundleutils.IkeSessionParamsUtils.isIkeOptionValid;

import static android.system.OsConstants.AF_INET;

import static android.system.OsConstants.AF_INET;

import static android.system.OsConstants.AF_INET6;

import static android.system.OsConstants.AF_INET6;

import static android.telephony.TelephonyManager.APPTYPE_USIM;

import static android.telephony.TelephonyManager.APPTYPE_USIM;
@@ -160,13 +160,11 @@ public class IkeSessionParamsUtilsTest { 
                        .addIkeOption(IkeSessionParams.IKE_OPTION_MOBIKE)

                        .addIkeOption(IkeSessionParams.IKE_OPTION_MOBIKE)

                        .addIkeOption(IkeSessionParams.IKE_OPTION_FORCE_PORT_4500)

                        .addIkeOption(IkeSessionParams.IKE_OPTION_FORCE_PORT_4500)

                        .addIkeOption(IkeSessionParams.IKE_OPTION_INITIAL_CONTACT)

                        .addIkeOption(IkeSessionParams.IKE_OPTION_INITIAL_CONTACT)

                        .addIkeOption(IkeSessionParams.IKE_OPTION_REKEY_MOBILITY);

                        .addIkeOption(IkeSessionParams.IKE_OPTION_REKEY_MOBILITY)

        if (isIkeOptionValid(IKE_OPTION_AUTOMATIC_ADDRESS_FAMILY_SELECTION)) {

                        .addIkeOption(IKE_OPTION_AUTOMATIC_ADDRESS_FAMILY_SELECTION)

            builder.addIkeOption(IKE_OPTION_AUTOMATIC_ADDRESS_FAMILY_SELECTION);

                        .addIkeOption(IKE_OPTION_AUTOMATIC_NATT_KEEPALIVES)

        }

                        .addIkeOption(IKE_OPTION_AUTOMATIC_KEEPALIVE_ON_OFF);

        if (isIkeOptionValid(IKE_OPTION_AUTOMATIC_NATT_KEEPALIVES)) {



            builder.addIkeOption(IKE_OPTION_AUTOMATIC_NATT_KEEPALIVES);

        }

        verifyPersistableBundleEncodeDecodeIsLossless(builder.build());

        verifyPersistableBundleEncodeDecodeIsLossless(builder.build());

    }

    }