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

Merge "Add the IP version and encap type to IkeSessionParamsUtils." am: 325527e280 am: 0792817c6b am: 3481e8423d

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

Change-Id: I799ab7a7a4153e405488efe7f486c9bbcf98983b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Lorenzo Colitti
2023-02-17 06:32:19 +00:00
committed by Automerger Merge Worker
parent 1a078491d1 3481e8423d
commit dd76f4b3fc
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -74,6 +74,9 @@ public final class IkeSessionParamsUtils {
private static final String DPD_DELAY_SEC_KEY = "DPD_DELAY_SEC_KEY"; private static final String DPD_DELAY_SEC_KEY = "DPD_DELAY_SEC_KEY";
private static final String NATT_KEEPALIVE_DELAY_SEC_KEY = "NATT_KEEPALIVE_DELAY_SEC_KEY"; private static final String NATT_KEEPALIVE_DELAY_SEC_KEY = "NATT_KEEPALIVE_DELAY_SEC_KEY";
private static final String IKE_OPTIONS_KEY = "IKE_OPTIONS_KEY"; private static final String IKE_OPTIONS_KEY = "IKE_OPTIONS_KEY";
private static final String IP_VERSION_KEY = "IP_VERSION_KEY";
private static final String ENCAP_TYPE_KEY = "ENCAP_TYPE_KEY";
// TODO: add DSCP_KEY and IS_IKE_FRAGMENT_SUPPORTED_KEY.
// TODO: b/243181760 Use the IKE API when they are exposed // TODO: b/243181760 Use the IKE API when they are exposed
@VisibleForTesting(visibility = Visibility.PRIVATE) @VisibleForTesting(visibility = Visibility.PRIVATE)
@@ -156,6 +159,8 @@ public final class IkeSessionParamsUtils {
result.putInt(SOFT_LIFETIME_SEC_KEY, params.getSoftLifetimeSeconds()); result.putInt(SOFT_LIFETIME_SEC_KEY, params.getSoftLifetimeSeconds());
result.putInt(DPD_DELAY_SEC_KEY, params.getDpdDelaySeconds()); result.putInt(DPD_DELAY_SEC_KEY, params.getDpdDelaySeconds());
result.putInt(NATT_KEEPALIVE_DELAY_SEC_KEY, params.getNattKeepAliveDelaySeconds()); result.putInt(NATT_KEEPALIVE_DELAY_SEC_KEY, params.getNattKeepAliveDelaySeconds());
result.putInt(IP_VERSION_KEY, params.getIpVersion());
result.putInt(ENCAP_TYPE_KEY, params.getEncapType());
// TODO: b/185941731 Make sure IkeSessionParamsUtils is automatically updated when a new // TODO: b/185941731 Make sure IkeSessionParamsUtils is automatically updated when a new
// IKE_OPTION is defined in IKE module and added in the IkeSessionParams // IKE_OPTION is defined in IKE module and added in the IkeSessionParams
@@ -207,6 +212,8 @@ public final class IkeSessionParamsUtils {
in.getInt(HARD_LIFETIME_SEC_KEY), in.getInt(SOFT_LIFETIME_SEC_KEY)); in.getInt(HARD_LIFETIME_SEC_KEY), in.getInt(SOFT_LIFETIME_SEC_KEY));
builder.setDpdDelaySeconds(in.getInt(DPD_DELAY_SEC_KEY)); builder.setDpdDelaySeconds(in.getInt(DPD_DELAY_SEC_KEY));
builder.setNattKeepAliveDelaySeconds(in.getInt(NATT_KEEPALIVE_DELAY_SEC_KEY)); builder.setNattKeepAliveDelaySeconds(in.getInt(NATT_KEEPALIVE_DELAY_SEC_KEY));
builder.setIpVersion(in.getInt(IP_VERSION_KEY));
builder.setEncapType(in.getInt(ENCAP_TYPE_KEY));
final PersistableBundle configReqListBundle = in.getPersistableBundle(CONFIG_REQUESTS_KEY); final PersistableBundle configReqListBundle = in.getPersistableBundle(CONFIG_REQUESTS_KEY);
Objects.requireNonNull(configReqListBundle, "Config request list was null"); Objects.requireNonNull(configReqListBundle, "Config request list was null");