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

Commit 61ada77f authored by Yan Yan's avatar Yan Yan Committed by Automerger Merge Worker
Browse files

Merge "Add and expose IPsec tunnel migration feature flag" am: bbed0273 am: ab0be118 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1634879



Change-Id: Ib4efe0e2258cfab8cd1c58b21ada013db287c106
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 981b79f3 ab0be118

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -11938,6 +11938,7 @@ package android.content.pm { 
    field public static final String FEATURE_IDENTITY_CREDENTIAL_HARDWARE_DIRECT_ACCESS = "android.hardware.identity_credential_direct_access";

    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_IPSEC_TUNNEL_MIGRATION = "android.software.ipsec_tunnel_migration";

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

    field public static final String FEATURE_KEYSTORE_APP_ATTEST_KEY = "android.hardware.keystore.app_attest_key";

    field public static final String FEATURE_KEYSTORE_LIMITED_USE_KEY = "android.hardware.keystore.limited_use_key";

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

+11 −0
Original line number Diff line number Diff line
@@ -4057,6 +4057,17 @@ public abstract class PackageManager { 
    @SdkConstant(SdkConstantType.FEATURE)

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



    /**

     * Feature for {@link #getSystemAvailableFeatures} and {@link #hasSystemFeature}: The device has

     * the requisite kernel support for migrating IPsec tunnels to new source/destination addresses.

     *

     * <p>This feature implies that the device supports XFRM Migration (CONFIG_XFRM_MIGRATE) and has

     * the kernel fixes to support cross-address-family IPsec tunnel migration

     */

    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_IPSEC_TUNNEL_MIGRATION =

            "android.software.ipsec_tunnel_migration";



    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: The device supports a system interface for the user to select