commit 375f7d743d3be275520c9cf95ebef8f73f632476
author Janis Danisevskis <jdanis@google.com> Mon Nov 30 00:09:08 2020 -0800
committer Janis Danisevskis <jdanis@google.com> Mon Nov 30 00:29:22 2020 -0800
tree 45ea0d8a848bd0a72846375ba2c8e907b2b0105d
parent 321618f71135f0862f0514a29fcc3cccc964bd82

KeyMint 1.0: Fix tag type of USER_SECURE_ID.

Test: None
Bug: 174445211
Change-Id: Ic8f346c58db875ee9fe4131f87de8c1bc5e9ec18

keymint/aidl/aidl_api/android.hardware.keymint/current/android/hardware/keymint/Tag.aidl

diff --git a/keymint/aidl/aidl_api/android.hardware.keymint/current/android/hardware/keymint/Tag.aidl b/keymint/aidl/aidl_api/android.hardware.keymint/current/android/hardware/keymint/Tag.aidl
index fba58af..33a95fe 100644
--- a/keymint/aidl/aidl_api/android.hardware.keymint/current/android/hardware/keymint/Tag.aidl
+++ b/keymint/aidl/aidl_api/android.hardware.keymint/current/android/hardware/keymint/Tag.aidl
@@ -41,7 +41,7 @@
   MIN_SECONDS_BETWEEN_OPS = 805306771,
   MAX_USES_PER_BOOT = 805306772,
   USER_ID = 805306869,
-  USER_SECURE_ID = 1073742326,
+  USER_SECURE_ID = -1610612234,
   NO_AUTH_REQUIRED = 1879048695,
   USER_AUTH_TYPE = 268435960,
   AUTH_TIMEOUT = 805306873,

keymint/aidl/android/hardware/keymint/Tag.aidl

diff --git a/keymint/aidl/android/hardware/keymint/Tag.aidl b/keymint/aidl/android/hardware/keymint/Tag.aidl
index e85a8f5..46da096 100644
--- a/keymint/aidl/android/hardware/keymint/Tag.aidl
+++ b/keymint/aidl/android/hardware/keymint/Tag.aidl
@@ -355,7 +355,7 @@
      *
      * Must be hardware-enforced.
      */
-    USER_SECURE_ID = (4 << 28) | 502, /* TagType:UINT_REP */
+    USER_SECURE_ID = (10 << 28) | 502, /* TagType:ULONG_REP */
 
     /**
      * Tag::NO_AUTH_REQUIRED specifies that no authentication is required to use this key.  This tag