diff options
| author | 2021-02-03 17:14:16 +0000 | |
|---|---|---|
| committer | 2021-02-03 17:14:16 +0000 | |
| commit | 56e16a02084a73022d559d92299ce786b24127cb (patch) | |
| tree | 770924d2dfaef429fc751fa0603b807332e4bc0d | |
| parent | 6b3ed78bf6d60f21a4213e237e5721c1321cff60 (diff) | |
| parent | cd6c58acd83c7a77783258f65dc99a0455e290d2 (diff) | |
Limited use key: feature flags. am: cd6c58acd8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552315
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I52b94248ad9f27083cfe7c7e46243ec0ebe56699
| -rw-r--r-- | core/api/current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/content/pm/PackageManager.java | 18 |
2 files changed, 20 insertions, 0 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index f453ccaf75ad..5bea862ced92 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -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"; diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index 31beb6e6a565..742f48c7a6a3 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -3224,6 +3224,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; |