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

Commit 5e8ba3c7 authored by Qi Wu's avatar Qi Wu Committed by Automerger Merge Worker
Browse files

Limited use key: feature flags. am: cd6c58ac am: 56e16a02 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I41b4c5a3272925b4bb71fbb1d57992793d1602c7
parents dd1c1880 56e16a02

core/api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -12134,6 +12134,8 @@ package android.content.pm { 
    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_IRIS = "android.hardware.biometrics.iris";

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

    field public static final String FEATURE_KEYSTORE_SINGLE_USE_KEY = "android.hardware.keystore.single_use_key";

    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

+18 −0
Original line number Diff line number Diff line
@@ -3238,6 +3238,24 @@ public abstract class PackageManager { 
    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_APP_ENUMERATION = "android.software.app_enumeration";



    /**

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

     * a Keystore implementation that can only enforce limited use key in hardware with max usage

     * count equals to 1.

     */

    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_KEYSTORE_SINGLE_USE_KEY =

            "android.hardware.keystore.single_use_key";



    /**

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

     * a Keystore implementation that can enforce limited use key in hardware with any max usage

     * count (including count equals to 1).

     */

    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_KEYSTORE_LIMITED_USE_KEY =

            "android.hardware.keystore.limited_use_key";



    /** @hide */

    public static final boolean APP_ENUMERATION_ENABLED_BY_DEFAULT = true;