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

Merge "Support encoding/decoding IkeSessionParams with IKE_OPTION_INITIAL_CONTACT" am: 839597dea5

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

Change-Id: I7d084f653c30257c30e660dda4d5681cd8164a48
This commit is contained in:
Nagendra Prasad Nagarle Basavaraju
2021-11-02 00:12:14 +00:00
committed by Automerger Merge Worker
parent a1eddb7c62 839597dea5
commit b816eaa304
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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. */

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

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