From ae8da1b70ad563edb79f4f7429b704b54c1a9e19 Mon Sep 17 00:00:00 2001 From: Eran Messeri Date: Tue, 19 Jun 2018 17:12:04 +0100 Subject: [PATCH] Fixing Keymaster documentation. Keymaster HAL documentation documents the bootPatchLevel as having tag 718, while types.hal indicates the tag value for it is actually 719. Test: N/A Bug: 78104779 Change-Id: I0dde0b3c863081f2594e20466d8e82866a5f2d2e --- current.txt | 2 +- keymaster/4.0/IKeymasterDevice.hal | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/current.txt b/current.txt index cc15322b83..c4d3463298 100644 --- a/current.txt +++ b/current.txt @@ -335,7 +335,7 @@ dd83be076b6b3f10ed62ab34d8c8b95f2415961fb785200eb842e7bfb2b0ee92 android.hardwar 675682dd3007805c985eaaec91612abc88f4c25b3431fb84070b7584a1a741fb android.hardware.health@2.0::IHealth 434c4c32c00b0e54bb05e40c79503208b40f786a318029a2a4f66e34f10f2a76 android.hardware.health@2.0::IHealthInfoCallback c9e498f1ade5e26f00d290b4763a9671ec6720f915e7d592844b62e8cb1f9b5c android.hardware.health@2.0::types -201f9723353fdbd40bf3705537fb7e015e4c399879425e68688fe0f43606ea4d android.hardware.keymaster@4.0::IKeymasterDevice +6122abe9bc2e7868463d3787db2991c1e47cc01fe3e4cfb7293c5ba421ff8ad9 android.hardware.keymaster@4.0::IKeymasterDevice 1b7d2090c0a28b229d37c4b96160796b1f0d703950ac6ccc163fccd280830503 android.hardware.keymaster@4.0::types 6d5c646a83538f0f9d8438c259932509f4353410c6c76e56db0d6ca98b69c3bb android.hardware.media.bufferpool@1.0::IAccessor b8c7ed58aa8740361e63d0ce9e7c94227572a629f356958840b34809d2393a7c android.hardware.media.bufferpool@1.0::IClientManager diff --git a/keymaster/4.0/IKeymasterDevice.hal b/keymaster/4.0/IKeymasterDevice.hal index 74d13d8b0d..85a25c6d32 100644 --- a/keymaster/4.0/IKeymasterDevice.hal +++ b/keymaster/4.0/IKeymasterDevice.hal @@ -753,7 +753,7 @@ interface IKeymasterDevice { * attestationIdManufacturer [716] EXPLICIT OCTET_STRING OPTIONAL, * attestationIdModel [717] EXPLICIT OCTET_STRING OPTIONAL, * vendorPatchLevel [718] EXPLICIT INTEGER OPTIONAL, - * bootPatchLevel [718] EXPLICIT INTEGER OPTIONAL, + * bootPatchLevel [719] EXPLICIT INTEGER OPTIONAL, * } * * The above schema is mostly a straightforward translation of the IKeymasterDevice tag/value