diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-04-16 20:31:46 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-16 20:31:46 +0000 |
| commit | aa0d7f60b6efe093dbf9281ccb89597a421bca1d (patch) | |
| tree | c6c8bc987c34c597ac2b5a64a1a8f6e252ec3b7b /core/java/android/security/keymaster | |
| parent | 8fcd5fee60b468c36aee337da0cadad3cd8cf4cd (diff) | |
| parent | b1aa7d0bc821614d943075c0d786cc3f5eeb8c73 (diff) | |
| download | frameworks_base-aa0d7f60b6efe093dbf9281ccb89597a421bca1d.zip frameworks_base-aa0d7f60b6efe093dbf9281ccb89597a421bca1d.tar.gz frameworks_base-aa0d7f60b6efe093dbf9281ccb89597a421bca1d.tar.bz2 | |
am b1aa7d0b: am 51884f0e: am 499126c4: Merge "Add Keymaster KM_ORIGIN_UNKNOWN constant."
* commit 'b1aa7d0bc821614d943075c0d786cc3f5eeb8c73':
Add Keymaster KM_ORIGIN_UNKNOWN constant.
Diffstat (limited to 'core/java/android/security/keymaster')
| -rw-r--r-- | core/java/android/security/keymaster/KeymasterDefs.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/security/keymaster/KeymasterDefs.java b/core/java/android/security/keymaster/KeymasterDefs.java index ab8a8b6..40baf9c 100644 --- a/core/java/android/security/keymaster/KeymasterDefs.java +++ b/core/java/android/security/keymaster/KeymasterDefs.java @@ -118,9 +118,9 @@ public final class KeymasterDefs { public static final int KM_DIGEST_SHA_2_512 = 6; // Key origins. - public static final int KM_ORIGIN_HARDWARE = 0; - public static final int KM_ORIGIN_SOFTWARE = 1; + public static final int KM_ORIGIN_GENERATED = 0; public static final int KM_ORIGIN_IMPORTED = 2; + public static final int KM_ORIGIN_UNKNOWN = 3; // Key usability requirements. public static final int KM_BLOB_STANDALONE = 0; |