diff options
| author | Shawn Willden <swillden@google.com> | 2021-02-17 20:49:09 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-17 20:49:09 +0000 |
| commit | c418d4ef15521d460a8ddfa7b2e6fe712dbdb3b6 (patch) | |
| tree | 2ea9d6ec0b35251b568ba9476093304c5f096725 /core/java/android/security | |
| parent | 20fcf469a39242c2e9ba789255d4030b3007a4ae (diff) | |
| parent | bbdb4d9ee592b2a25b56dbefc8e5b13b9489ce8f (diff) | |
Merge "Add support for app-generated attestation keys." am: 50a66e39cd am: 2da3a280d2 am: bbdb4d9ee5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1584474
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0e4b2bcfa54953e37452a7533a89b49586596502
Diffstat (limited to 'core/java/android/security')
| -rw-r--r-- | core/java/android/security/keymaster/KeymasterDefs.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/security/keymaster/KeymasterDefs.java b/core/java/android/security/keymaster/KeymasterDefs.java index a79b197d3faa..5a89cdf1d340 100644 --- a/core/java/android/security/keymaster/KeymasterDefs.java +++ b/core/java/android/security/keymaster/KeymasterDefs.java @@ -188,6 +188,7 @@ public final class KeymasterDefs { public static final int KM_PURPOSE_VERIFY = KeyPurpose.VERIFY; public static final int KM_PURPOSE_WRAP = KeyPurpose.WRAP_KEY; public static final int KM_PURPOSE_AGREE_KEY = KeyPurpose.AGREE_KEY; + public static final int KM_PURPOSE_ATTEST_KEY = KeyPurpose.ATTEST_KEY; // Key formats. public static final int KM_KEY_FORMAT_X509 = KeyFormat.X509; |