commit acce5d3c6847760c902fd4d452b9a204f310d54e
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Jul 08 15:32:25 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 08 15:32:25 2021 +0000
tree 756bc6d1b74e58410d281de4b7ad5789d6012141
parent 12ee28322da50ee86484f401c70bd119cc4b4042
parent befeda6b00eef1042aba3a3d0e3d401636da5289

Merge "Use TagType constants" into sc-dev

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

diff --git a/security/keymint/aidl/android/hardware/security/keymint/Tag.aidl b/security/keymint/aidl/android/hardware/security/keymint/Tag.aidl
index a785480..01bf54b 100644
--- a/security/keymint/aidl/android/hardware/security/keymint/Tag.aidl
+++ b/security/keymint/aidl/android/hardware/security/keymint/Tag.aidl
@@ -289,6 +289,8 @@
      * fails because the table is full, KeyMint returns ErrorCode::TOO_MANY_OPERATIONS.
      *
      * Must be hardware-enforced.
+     *
+     * TODO(b/191738660): Remove in KeyMint V2. Currently only used for FDE.
      */
     MIN_SECONDS_BETWEEN_OPS = TagType.UINT | 403,
 
@@ -879,7 +881,8 @@
     STORAGE_KEY = TagType.BOOL | 722,
 
     /**
-     * TODO: Delete when keystore1 is deleted.
+     * OBSOLETE: Do not use. See IKeyMintOperation.updateAad instead.
+     * TODO(b/191738660): Remove in KeyMint v2.
      */
     ASSOCIATED_DATA = TagType.BYTES | 1000,