From 3afaa9e51ad0b251809612c5d8eae879cad91423 Mon Sep 17 00:00:00 2001 From: Nagendra Prasad Nagarle Basavaraju Date: Mon, 25 Oct 2021 09:43:35 +0000 Subject: [PATCH] Support encoding/decoding IkeSessionParams with IKE_OPTION_INITIAL_CONTACT This commit updates IkeSessionParamsUtils to be able to encode/decode IkeSessionParams with IKE_OPTION_INITIAL_CONTACT to/from a PersistableBundle If this option is set for an IKE Session, The INITIAL CONTACT message is sent to the peer to ensure that old security associations (SAs) on the peer are deleted. Bug: 186179788 Test: atest FrameworksIkeTests Change-Id: I4ecd36ae222d95a84e8e6897a219f8accb9ed83b --- .../net/vcn/persistablebundleutils/IkeSessionParamsUtils.java | 1 + .../vcn/persistablebundleutils/IkeSessionParamsUtilsTest.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/core/java/android/net/vcn/persistablebundleutils/IkeSessionParamsUtils.java b/core/java/android/net/vcn/persistablebundleutils/IkeSessionParamsUtils.java index 09f528369ffb1..be573721936bc 100644 --- a/core/java/android/net/vcn/persistablebundleutils/IkeSessionParamsUtils.java +++ b/core/java/android/net/vcn/persistablebundleutils/IkeSessionParamsUtils.java @@ -79,6 +79,7 @@ public final class IkeSessionParamsUtils { IKE_OPTIONS.add(IkeSessionParams.IKE_OPTION_EAP_ONLY_AUTH); IKE_OPTIONS.add(IkeSessionParams.IKE_OPTION_MOBIKE); IKE_OPTIONS.add(IkeSessionParams.IKE_OPTION_FORCE_PORT_4500); + IKE_OPTIONS.add(IkeSessionParams.IKE_OPTION_INITIAL_CONTACT); } /** Serializes an IkeSessionParams to a PersistableBundle. */ diff --git a/tests/vcn/java/android/net/vcn/persistablebundleutils/IkeSessionParamsUtilsTest.java b/tests/vcn/java/android/net/vcn/persistablebundleutils/IkeSessionParamsUtilsTest.java index f3851130c68a1..3b201f9d20dd5 100644 --- a/tests/vcn/java/android/net/vcn/persistablebundleutils/IkeSessionParamsUtilsTest.java +++ b/tests/vcn/java/android/net/vcn/persistablebundleutils/IkeSessionParamsUtilsTest.java @@ -135,11 +135,12 @@ public class IkeSessionParamsUtilsTest { } @Test - public void testEncodeRecodeParamsWithIkeOptions() throws Exception { + public void testEncodeDecodeParamsWithIkeOptions() throws Exception { final IkeSessionParams params = createBuilderMinimum() .addIkeOption(IkeSessionParams.IKE_OPTION_ACCEPT_ANY_REMOTE_ID) .addIkeOption(IkeSessionParams.IKE_OPTION_MOBIKE) + .addIkeOption(IkeSessionParams.IKE_OPTION_INITIAL_CONTACT) .build(); verifyPersistableBundleEncodeDecodeIsLossless(params); }