Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b990bc7 authored by Janis Danisevskis's avatar Janis Danisevskis Committed by Automerger Merge Worker
Browse files

KeyMint 1.0: Fix tag type of USER_SECURE_ID. am: 375f7d74 

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

Change-Id: I14cd6576cb393e8eacca0f6d1540ad876237a62c
parents 47c899b6 375f7d74

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -41,7 +41,7 @@ enum Tag { 
  MIN_SECONDS_BETWEEN_OPS = 805306771,

  MIN_SECONDS_BETWEEN_OPS = 805306771,

  MAX_USES_PER_BOOT = 805306772,

  MAX_USES_PER_BOOT = 805306772,

  USER_ID = 805306869,

  USER_ID = 805306869,

  USER_SECURE_ID = 1073742326,

  USER_SECURE_ID = -1610612234,

  NO_AUTH_REQUIRED = 1879048695,

  NO_AUTH_REQUIRED = 1879048695,

  USER_AUTH_TYPE = 268435960,

  USER_AUTH_TYPE = 268435960,

  AUTH_TIMEOUT = 805306873,

  AUTH_TIMEOUT = 805306873,

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -355,7 +355,7 @@ enum Tag { 
     *

     *

     * Must be hardware-enforced.

     * 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

     * Tag::NO_AUTH_REQUIRED specifies that no authentication is required to use this key.  This tag