commit 1bed39a5e4d57e4735e72a1e9765dcec62035b40
author Shawn Willden <swillden@google.com> Thu Mar 19 00:42:09 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Mar 19 00:42:09 2015 +0000
tree 6639ad4a264cb5ecb88520f1894377f753740b6d
parent 615f39f911cdc4201b4e1c63c79ae1819a6645ea
parent e921b8a28f0d5b69fbb30374241c62fa90e92013

am e921b8a2: Merge "Rename KM_TAG_USER_AUTH_ID to KM_TAG_USER_AUTH_TYPE."

* commit 'e921b8a28f0d5b69fbb30374241c62fa90e92013':
  Rename KM_TAG_USER_AUTH_ID to KM_TAG_USER_AUTH_TYPE.

core/java/android/security/keymaster/KeymasterDefs.java

diff --git a/core/java/android/security/keymaster/KeymasterDefs.java b/core/java/android/security/keymaster/KeymasterDefs.java
index 218eac8..e653b74 100644
--- a/core/java/android/security/keymaster/KeymasterDefs.java
+++ b/core/java/android/security/keymaster/KeymasterDefs.java
@@ -69,7 +69,7 @@
     public static final int KM_TAG_USER_ID = KM_INT | 501;
     public static final int KM_TAG_USER_SECURE_ID = KM_LONG_REP | 502;
     public static final int KM_TAG_NO_AUTH_REQUIRED = KM_BOOL | 503;
-    public static final int KM_TAG_USER_AUTH_ID = KM_INT_REP | 504;
+    public static final int KM_TAG_USER_AUTH_TYPE = KM_ENUM | 504;
     public static final int KM_TAG_AUTH_TIMEOUT = KM_INT | 505;
 
     public static final int KM_TAG_ALL_APPLICATIONS = KM_BOOL | 600;