Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Keystore 2.0 SPI: Update KeyInfo and KeyGenParameterSpec" am: 17f24b5799 am: 7d49ae705e am: 7662e81e98 am: b90d33bd18

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

Change-Id: I5728741cdd66f9b6ba6f39310c796cb8b12758e5
This commit is contained in:
Janis Danisevskis
2020-11-12 00:55:08 +00:00
committed by Automerger Merge Worker
parent 54db2fb08e b90d33bd18
commit 94f9ea72a0
9 changed files with 186 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api/current.txt
View File

@@ -43126,10 +43126,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();

7
api/system-current.txt
View File

@@ -9921,8 +9921,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);
}
}