diff options
| author | Janis Danisevskis <jdanis@google.com> | 2020-11-12 00:48:26 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-12 00:48:26 +0000 |
| commit | b90d33bd18c75c7d35b84007931c2690f33bd1b3 (patch) | |
| tree | e98f811454c5f7ca938fd71d25d1f1b9fae0d545 /api | |
| parent | 19cd892b9e11d8cf4f36ad40eef445fc6ae26cf4 (diff) | |
| parent | 7662e81e987c831479937f591488b7a6303da328 (diff) | |
Merge "Keystore 2.0 SPI: Update KeyInfo and KeyGenParameterSpec" am: 17f24b5799 am: 7d49ae705e am: 7662e81e98
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470091
Change-Id: I8a3f19ea8cfe16dd8a6d06007306ccaa9ed7257a
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 3 | ||||
| -rwxr-xr-x | api/system-current.txt | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index 40b321934497..9502bcaa5287 100644 --- a/api/current.txt +++ b/api/current.txt @@ -42821,10 +42821,11 @@ package android.security.keystore { method public String getKeystoreAlias(); method public int getOrigin(); method public int getPurposes(); + method public int getSecurityLevel(); method @NonNull public String[] getSignaturePaddings(); method public int getUserAuthenticationType(); method public int getUserAuthenticationValidityDurationSeconds(); - method public boolean isInsideSecureHardware(); + method @Deprecated public boolean isInsideSecureHardware(); method public boolean isInvalidatedByBiometricEnrollment(); method public boolean isTrustedUserPresenceRequired(); method public boolean isUserAuthenticationRequired(); diff --git a/api/system-current.txt b/api/system-current.txt index 042e2dc53b9c..abe95aebf8b2 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -9377,8 +9377,13 @@ package android.security.keystore { ctor public DeviceIdAttestationException(@Nullable String, @Nullable Throwable); } + public final class KeyGenParameterSpec implements java.security.spec.AlgorithmParameterSpec { + method public int getNamespace(); + } + public static final class KeyGenParameterSpec.Builder { - method @NonNull public android.security.keystore.KeyGenParameterSpec.Builder setUid(int); + method @NonNull public android.security.keystore.KeyGenParameterSpec.Builder setNamespace(int); + method @Deprecated @NonNull public android.security.keystore.KeyGenParameterSpec.Builder setUid(int); } } |