summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Benedict Wong <benedictwong@google.com> 2019-05-08 20:04:06 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2019-05-08 20:04:06 +0000
commit86f2f55b86c962bc341a23f47f541b7a9c76f740 (patch)
tree6b1e9607543991924aef8de6d376cb5180b6b1ae
parent8ff4a5a5b510e724b25ac00369696594bb0c9fdc (diff)
parentbc9c098e125a40cd07dafea0f3dab01186990a5d (diff)
Merge "Add IPsec tunnel mode feature flag"
-rwxr-xr-xapi/current.txt1
-rw-r--r--core/java/android/content/pm/PackageManager.java10
2 files changed, 11 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 7842dda0aa14..4c015b6b855f 100755
--- a/api/current.txt
+++ b/api/current.txt
@@ -11323,6 +11323,7 @@ package android.content.pm {
field public static final String FEATURE_HIFI_SENSORS = "android.hardware.sensor.hifi_sensors";
field public static final String FEATURE_HOME_SCREEN = "android.software.home_screen";
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_LEANBACK = "android.software.leanback";
field public static final String FEATURE_LEANBACK_ONLY = "android.software.leanback_only";
field public static final String FEATURE_LIVE_TV = "android.software.live_tv";
diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java
index 72981a773277..4f7f07bdee55 100644
--- a/core/java/android/content/pm/PackageManager.java
+++ b/core/java/android/content/pm/PackageManager.java
@@ -2719,6 +2719,16 @@ public abstract class PackageManager {
= "android.content.pm.CLEAN_EXTERNAL_STORAGE";
/**
+ * Feature for {@link #getSystemAvailableFeatures} and {@link #hasSystemFeature}: The device has
+ * the requisite kernel support for multinetworking-capable IPsec tunnels.
+ *
+ * <p>This feature implies that the device supports XFRM Interfaces (CONFIG_XFRM_INTERFACE), or
+ * VTIs with kernel patches allowing updates of output/set mark via UPDSA.
+ */
+ @SdkConstant(SdkConstantType.FEATURE)
+ public static final String FEATURE_IPSEC_TUNNELS = "android.software.ipsec_tunnels";
+
+ /**
* Extra field name for the URI to a verification file. Passed to a package
* verifier.
*