Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add new IKE option in IkeSessionParamsUtils" am: 3cac9278de

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

Change-Id: I9d4d5954b20f05bff95307d01c160bfca7eeca25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Lorenzo Colitti
2023-02-15 08:19:56 +00:00
committed by Automerger Merge Worker
parent e793123762 3cac9278de
commit c9279975a9
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/android/net/vcn/persistablebundleutils/IkeSessionParamsUtils.java
View File

@@ -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);
} }
/** /**

14
tests/vcn/java/android/net/vcn/persistablebundleutils/IkeSessionParamsUtilsTest.java
View File

@@ -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());
} }