summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2020-11-06 01:18:29 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-11-06 01:18:29 +0000
commitf2abffe107a882f150b277f00c15b4deaf0d2b7a (patch)
tree2d01a3a160fc9d2dd4cacc12576337005d387bd8 /core/java
parent109471deae6619192b1e1ee3b27c71f37eb5f508 (diff)
parent1f65c6b62eefa4b88b78bf65f2be968ae2030552 (diff)
Merge changes Ib3c9affb,I1dbe3d02,I88681f21 am: 1f65c6b62e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1451015 Change-Id: I7e3750c38b1796fb7ba20bdd544fb9831e5eb874
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/security/keymaster/KeymasterDefs.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/core/java/android/security/keymaster/KeymasterDefs.java b/core/java/android/security/keymaster/KeymasterDefs.java
index f08756a015b2..e32ffa6e9d05 100644
--- a/core/java/android/security/keymaster/KeymasterDefs.java
+++ b/core/java/android/security/keymaster/KeymasterDefs.java
@@ -157,6 +157,11 @@ public final class KeymasterDefs {
public static final int HW_AUTH_PASSWORD = 1 << 0;
public static final int HW_AUTH_BIOMETRIC = 1 << 1;
+ // Security Levels.
+ public static final int KM_SECURITY_LEVEL_SOFTWARE = 0;
+ public static final int KM_SECURITY_LEVEL_TRUSTED_ENVIRONMENT = 1;
+ public static final int KM_SECURITY_LEVEL_STRONGBOX = 2;
+
// Error codes.
public static final int KM_ERROR_OK = 0;
public static final int KM_ERROR_ROOT_OF_TRUST_ALREADY_SET = -1;