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

Commit 0185ac72 authored by Eran Messeri's avatar Eran Messeri Committed by Automerger Merge Worker
Browse files

Merge "Annotate some TODOs" am: 302d29eb 

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

Change-Id: I44b41e53bf2057d1413a49e691c04e8e32912868
parents ea113e83 302d29eb

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

+2 −2
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ enum Tag { 
     *

     * Must be hardware-enforced.

     *

     * TODO(b/191458710): find out if this tag is still supported.

     * TODO(b/191738660): Remove in KeyMint V2. Currently only used for FDE.

     */

    MIN_SECONDS_BETWEEN_OPS = TagType.UINT | 403,
@@ -878,7 +878,7 @@ enum Tag { 


    /**

     * OBSOLETE: Do not use. See IKeyMintOperation.updateAad instead.

     * TODO: Delete when keystore1 is deleted.

     * TODO(b/191738660): Remove in KeyMint v2.

     */

    ASSOCIATED_DATA = TagType.BYTES | 1000,