commit fa5c6b8b65501e144a03fd10f347b4487d3996dd
author Janis Danisevskis <jdanis@google.com> Mon Nov 30 18:21:22 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Nov 30 18:21:22 2020 +0000
tree f311023bc00ab65c1ea57fdcc845d9de4749b8a3
parent 8bb44c34b22169c27b5177d4874edec2581a120e
parent 1b990bc7dc5ec98e9986919afbad262cde6c53a5

KeyMint 1.0: Fix tag type of USER_SECURE_ID. am: 375f7d743d am: 1b990bc7dc

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1513473

Change-Id: Icf4e92fe021340126f1ba4eb7fac674dd5821cc8

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