diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-01-28 14:15:14 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-28 14:15:14 +0000 |
| commit | 42cc0967a580697c7c7e8f28c0092dfce0d75781 (patch) | |
| tree | b5994b1816d08632896ae44635deefeff7e9c56c /core/java | |
| parent | 8062b53a7cce52747d3c2f29baca39d266765622 (diff) | |
| parent | 5e78686425b34b4fcbddd025e6a6fa4edd7b3f87 (diff) | |
Merge "ECDH SPI interface" am: e43b86d5b1 am: 5e78686425
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542804
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie718a218f85265627c2e8088806bbc950cb2eb9e
Diffstat (limited to 'core/java')
| -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 017f40521a81..f994d2930cd9 100644 --- a/core/java/android/security/keymaster/KeymasterDefs.java +++ b/core/java/android/security/keymaster/KeymasterDefs.java @@ -177,6 +177,7 @@ public final class KeymasterDefs { public static final int KM_PURPOSE_SIGN = KeyPurpose.SIGN; 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; // Key formats. public static final int KM_KEY_FORMAT_X509 = KeyFormat.X509; |