Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c02acadd authored by Benedict Wong's avatar Benedict Wong Committed by Android (Google) Code Review
Browse files

Merge "Add IPsec tunnel mode feature flag"

parents c90e979d dc92c69b

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -11479,6 +11479,7 @@ package android.content.pm { 
    field public static final java.lang.String FEATURE_HIFI_SENSORS = "android.hardware.sensor.hifi_sensors";

    field public static final java.lang.String FEATURE_HOME_SCREEN = "android.software.home_screen";

    field public static final java.lang.String FEATURE_INPUT_METHODS = "android.software.input_methods";

    field public static final java.lang.String FEATURE_IPSEC_TUNNELS = "android.software.ipsec_tunnels";

    field public static final java.lang.String FEATURE_IRIS = "android.hardware.iris";

    field public static final java.lang.String FEATURE_LEANBACK = "android.software.leanback";

    field public static final java.lang.String FEATURE_LEANBACK_ONLY = "android.software.leanback_only";

core/java/android/content/pm/PackageManager.java

+10 −0
Original line number Diff line number Diff line
@@ -2686,6 +2686,16 @@ public abstract class PackageManager { 
    public static final String FEATURE_DEVICE_ID_ATTESTATION =

            "android.software.device_id_attestation";



    /**

     * 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.