diff options
| author | 2022-12-22 20:14:47 +0000 | |
|---|---|---|
| committer | 2022-12-22 20:14:47 +0000 | |
| commit | 9882b54f7592c78925f97506d0e627791a08c28e (patch) | |
| tree | 0e410b87d68f32298c8447cb642972dd06ee7540 | |
| parent | b55f03bc26038a3b73ec8f721fb9d0bd26a8c8e1 (diff) | |
| parent | 61ada77fb04f0302bde7cc55d4269afac852fe82 (diff) | |
Merge "Add and expose IPsec tunnel migration feature flag" am: bbed027319 am: ab0be118c1 am: 61ada77fb0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1634879
Change-Id: I5f5a821ff0eddfb2d297e44536eec6c201d736aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/content/pm/PackageManager.java | 11 |
2 files changed, 12 insertions, 0 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 7d361b9113c4..11a30503d93a 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -12256,6 +12256,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 cbdcc0226eac..4ac9a00c513d 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -4090,6 +4090,17 @@ public abstract class PackageManager { 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. + * + * <p>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 * and bind device control services provided by applications. |