diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-11-06 01:01:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-11-06 01:01:00 +0000 |
| commit | 1f65c6b62eefa4b88b78bf65f2be968ae2030552 (patch) | |
| tree | 2d01a3a160fc9d2dd4cacc12576337005d387bd8 /api | |
| parent | cce157aaeeeb22a9201d44a395a765401fcc817c (diff) | |
| parent | 145e11ff938971b63514dde1bbd887ddaa04f7ec (diff) | |
Merge changes Ib3c9affb,I1dbe3d02,I88681f21
* changes:
Keystore 2.0 SPI: Adding the keystore AIDL interface to frameworks
Keystore 2.0: KeyProperties SignaturePadding is now public but hidden
Keystore SPI: Add SecurityLevelEnum to KeyProperties
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index ee3f81ee38c6..5d46a686ebc9 100644 --- a/api/current.txt +++ b/api/current.txt @@ -42880,6 +42880,11 @@ package android.security.keystore { field public static final int PURPOSE_SIGN = 4; // 0x4 field public static final int PURPOSE_VERIFY = 8; // 0x8 field public static final int PURPOSE_WRAP_KEY = 32; // 0x20 + field public static final int SECURITY_LEVEL_SOFTWARE = 0; // 0x0 + field public static final int SECURITY_LEVEL_STRONGBOX = 2; // 0x2 + field public static final int SECURITY_LEVEL_TRUSTED_ENVIRONMENT = 1; // 0x1 + field public static final int SECURITY_LEVEL_UNKNOWN = -2; // 0xfffffffe + field public static final int SECURITY_LEVEL_UNKNOWN_SECURE = -1; // 0xffffffff field public static final String SIGNATURE_PADDING_RSA_PKCS1 = "PKCS1"; field public static final String SIGNATURE_PADDING_RSA_PSS = "PSS"; } |