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

Commit ad1e0006 authored by Benedict Wong's avatar Benedict Wong Committed by android-build-merger
Browse files

Merge "Add IPsec tunnel mode feature flag" 

am: 86f2f55b

Change-Id: I495ff2bfe4f60dfd77176bcd331816667ccd9c36
parents 351cc241 86f2f55b

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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";

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

+10 −0
Original line number Diff line number Diff line
@@ -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.