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

Merge "Add IPsec tunnel mode feature flag"

Browse Source
This commit is contained in:
Benedict Wong
2019-05-08 20:04:06 +00:00
committed by Gerrit Code Review
parent 8ff4a5a5b5 bc9c098e12
commit 86f2f55b86
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -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";

10
core/java/android/content/pm/PackageManager.java
View File

@@ -2718,6 +2718,16 @@ public abstract class PackageManager {
public static final String ACTION_CLEAN_EXTERNAL_STORAGE
= "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.