commit | 6f381fc935230ad922ed77a744b1a3e111708a8e | [log] [tgz] |
---|---|---|
author | Eran Messeri <eranm@google.com> | Tue Jul 06 14:21:25 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jul 06 14:21:25 2021 +0000 |
tree | 99565304cbbca5bd40925d46d198e861aedaa25a | |
parent | b6684b321cdc2dca619681d8ff76daf5fbf6c46a [diff] | |
parent | 3c8c7cdfa23b20f9af35fb3ae8ad0f51a73a5823 [diff] |
Merge "Annotate some TODOs" am: 302d29eb9b am: 0185ac7270 am: 3c8c7cdfa2 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1749641 Change-Id: I928acafa348c482aafbd7d0941f9395ff02b42e0
diff --git a/security/keymint/aidl/android/hardware/security/keymint/Tag.aidl b/security/keymint/aidl/android/hardware/security/keymint/Tag.aidl index e8ff14f..ec5f3d3 100644 --- a/security/keymint/aidl/android/hardware/security/keymint/Tag.aidl +++ b/security/keymint/aidl/android/hardware/security/keymint/Tag.aidl
@@ -286,7 +286,7 @@ * * 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 @@ /** * 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,