summaryrefslogtreecommitdiffstats
path: root/core/java/android/security/keymaster
diff options
context:
space:
mode:
authorAlex Klyubin <klyubin@google.com>2015-04-14 10:52:34 -0700
committerAlex Klyubin <klyubin@google.com>2015-04-14 10:52:34 -0700
commit45d27836bde9e641a57b69a1502924a29b9b3bf1 (patch)
treea07f0fd1516217d9957fd1bec8e02d734d7d363b /core/java/android/security/keymaster
parent8704ae464a001e17275257d19eae688ff3a28892 (diff)
downloadframeworks_base-45d27836bde9e641a57b69a1502924a29b9b3bf1.zip
frameworks_base-45d27836bde9e641a57b69a1502924a29b9b3bf1.tar.gz
frameworks_base-45d27836bde9e641a57b69a1502924a29b9b3bf1.tar.bz2
Add Keymaster KM_ORIGIN_UNKNOWN constant.
This tracks d359b044830b292f492f8a8df5471f869e358399 from hardware/libhardware. Bug: 18088752 Change-Id: I9a7bd8bdee51c18ae0427eff4efe036213d2b175
Diffstat (limited to 'core/java/android/security/keymaster')
-rw-r--r--core/java/android/security/keymaster/KeymasterDefs.java4
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 d3953b3..298636b 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;