From 43c8fd2aa1a2c2c90403f5b7895cc71d627a608e Mon Sep 17 00:00:00 2001 From: Yan Yan Date: Mon, 17 Oct 2022 22:38:39 +0000 Subject: [PATCH] Add and expose IPsec tunnel migration feature flag This patch adds a feature flag for IPsec tunnel migration. This implies XFRM_MIGRATE enabled in the kernel. Bug: 169169973 Test: make update-api Change-Id: I216ae2863a6c712f8eb2b9405674a45e0a19e888 --- core/api/current.txt | 1 + core/java/android/content/pm/PackageManager.java | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/core/api/current.txt b/core/api/current.txt index 05e2a9aa72860..41004b2a91513 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -11938,6 +11938,7 @@ package android.content.pm { field public static final String FEATURE_IDENTITY_CREDENTIAL_HARDWARE_DIRECT_ACCESS = "android.hardware.identity_credential_direct_access"; field public static final String FEATURE_INPUT_METHODS = "android.software.input_methods"; field public static final String FEATURE_IPSEC_TUNNELS = "android.software.ipsec_tunnels"; + field public static final String FEATURE_IPSEC_TUNNEL_MIGRATION = "android.software.ipsec_tunnel_migration"; field public static final String FEATURE_IRIS = "android.hardware.biometrics.iris"; field public static final String FEATURE_KEYSTORE_APP_ATTEST_KEY = "android.hardware.keystore.app_attest_key"; field public static final String FEATURE_KEYSTORE_LIMITED_USE_KEY = "android.hardware.keystore.limited_use_key"; diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index a90f6d625c514..f2d723229707d 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -4047,6 +4047,17 @@ public abstract class PackageManager { @SdkConstant(SdkConstantType.FEATURE) public static final String FEATURE_IPSEC_TUNNELS = "android.software.ipsec_tunnels"; + /** + * Feature for {@link #getSystemAvailableFeatures} and {@link #hasSystemFeature}: The device has + * the requisite kernel support for migrating IPsec tunnels to new source/destination addresses. + * + *

This feature implies that the device supports XFRM Migration (CONFIG_XFRM_MIGRATE) and has + * the kernel fixes to support cross-address-family IPsec tunnel migration + */ + @SdkConstant(SdkConstantType.FEATURE) + public static final String FEATURE_IPSEC_TUNNEL_MIGRATION = + "android.software.ipsec_tunnel_migration"; + /** * Feature for {@link #getSystemAvailableFeatures} and * {@link #hasSystemFeature}: The device supports a system interface for the user to select