From 48fce49a1c72434766b593b55fe4545450c0272a Mon Sep 17 00:00:00 2001 From: chiachangwang Date: Mon, 6 Feb 2023 02:13:31 +0000 Subject: [PATCH] Add new IKE option in IkeSessionParamsUtils This commit updates IkeSessionParamsUtils to be able to encode/decode IkeSessionParams with IKE_OPTION_AUTOMATIC_KEEPALIVE_ON_OFF. Bug: 259000745 Test: atest IkeSessionParamsUtilsTest Change-Id: I6dd24893cf3343df05ae41e657ff082145c1e8ff --- .../IkeSessionParamsUtils.java | 1 + .../IkeSessionParamsUtilsTest.java | 14 ++++++-------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/core/java/android/net/vcn/persistablebundleutils/IkeSessionParamsUtils.java b/core/java/android/net/vcn/persistablebundleutils/IkeSessionParamsUtils.java index d6f191e31182a..1b661e79353e2 100644 --- a/core/java/android/net/vcn/persistablebundleutils/IkeSessionParamsUtils.java +++ b/core/java/android/net/vcn/persistablebundleutils/IkeSessionParamsUtils.java @@ -93,6 +93,7 @@ public final class IkeSessionParamsUtils { IKE_OPTIONS.add(IkeSessionParams.IKE_OPTION_REKEY_MOBILITY); IKE_OPTIONS.add(IKE_OPTION_AUTOMATIC_ADDRESS_FAMILY_SELECTION); IKE_OPTIONS.add(IKE_OPTION_AUTOMATIC_NATT_KEEPALIVES); + IKE_OPTIONS.add(IkeSessionParams.IKE_OPTION_AUTOMATIC_KEEPALIVE_ON_OFF); } /** diff --git a/tests/vcn/java/android/net/vcn/persistablebundleutils/IkeSessionParamsUtilsTest.java b/tests/vcn/java/android/net/vcn/persistablebundleutils/IkeSessionParamsUtilsTest.java index e4add80981055..9f7d2390938f2 100644 --- a/tests/vcn/java/android/net/vcn/persistablebundleutils/IkeSessionParamsUtilsTest.java +++ b/tests/vcn/java/android/net/vcn/persistablebundleutils/IkeSessionParamsUtilsTest.java @@ -16,9 +16,9 @@ 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_NATT_KEEPALIVES; -import static android.net.vcn.persistablebundleutils.IkeSessionParamsUtils.isIkeOptionValid; import static android.system.OsConstants.AF_INET; import static android.system.OsConstants.AF_INET6; import static android.telephony.TelephonyManager.APPTYPE_USIM; @@ -160,13 +160,11 @@ public class IkeSessionParamsUtilsTest { .addIkeOption(IkeSessionParams.IKE_OPTION_MOBIKE) .addIkeOption(IkeSessionParams.IKE_OPTION_FORCE_PORT_4500) .addIkeOption(IkeSessionParams.IKE_OPTION_INITIAL_CONTACT) - .addIkeOption(IkeSessionParams.IKE_OPTION_REKEY_MOBILITY); - if (isIkeOptionValid(IKE_OPTION_AUTOMATIC_ADDRESS_FAMILY_SELECTION)) { - builder.addIkeOption(IKE_OPTION_AUTOMATIC_ADDRESS_FAMILY_SELECTION); - } - if (isIkeOptionValid(IKE_OPTION_AUTOMATIC_NATT_KEEPALIVES)) { - builder.addIkeOption(IKE_OPTION_AUTOMATIC_NATT_KEEPALIVES); - } + .addIkeOption(IkeSessionParams.IKE_OPTION_REKEY_MOBILITY) + .addIkeOption(IKE_OPTION_AUTOMATIC_ADDRESS_FAMILY_SELECTION) + .addIkeOption(IKE_OPTION_AUTOMATIC_NATT_KEEPALIVES) + .addIkeOption(IKE_OPTION_AUTOMATIC_KEEPALIVE_ON_OFF); + verifyPersistableBundleEncodeDecodeIsLossless(builder.build()); }