diff options
| author | Benedict Wong <benedictwong@google.com> | 2019-05-08 13:30:11 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-08 13:30:11 -0700 |
| commit | ad1e0006b16eeb98b86e44fd665743357a7eed15 (patch) | |
| tree | 3157b3b4c06034f0b6443662c818b26ef93bc351 | |
| parent | 351cc241da7c0018e778b42263449a0495a82e73 (diff) | |
| parent | 86f2f55b86c962bc341a23f47f541b7a9c76f740 (diff) | |
| download | base-ad1e0006b16eeb98b86e44fd665743357a7eed15.tar.gz | |
Merge "Add IPsec tunnel mode feature flag"
am: 86f2f55b86
Change-Id: I495ff2bfe4f60dfd77176bcd331816667ccd9c36
| -rwxr-xr-x | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/content/pm/PackageManager.java | 10 |
2 files changed, 11 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 9fd157fa0fc3..7867d52a2713 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. * |