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

Merge changes Ib3c9affb,I1dbe3d02,I88681f21 am: 1f65c6b62e am: f2abffe107 am: df8410e677

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

Change-Id: I654b14fb0386d5bea6d22e37a394b00c1f66a87c
This commit is contained in:
Treehugger Robot
2020-11-06 02:14:41 +00:00
committed by Automerger Merge Worker
parent 7c40b32326 df8410e677
commit 15e1f8f5eb
5 changed files with 106 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
api/current.txt
View File

@@ -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";
}