commit | 00f8bbab782b05d326d6a3320eebacb6ea0f24ff | [log] [tgz] |
---|---|---|
author | David Drysdale <drysdale@google.com> | Thu Jul 13 09:01:15 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jul 13 09:01:15 2023 +0000 |
tree | 3df8328746790a7d45d4ff28ad88835dd0b9e8ee | |
parent | 436af0139e07cd48662e56b1028fd979952dc724 [diff] | |
parent | 6c38c03f19a8431dbc952b552dddcc4e35e966ed [diff] |
Allow extra ID attestation error codes am: 3f6ab601b9 am: 4a70416566 am: 6c38c03f19 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2646973 Change-Id: Ib01d2cc05ab8ead7550cdb27f89ebc3a4c007173 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/security/keymint/aidl/vts/functional/KeyMintTest.cpp b/security/keymint/aidl/vts/functional/KeyMintTest.cpp index bdec4d3..1297d1d 100644 --- a/security/keymint/aidl/vts/functional/KeyMintTest.cpp +++ b/security/keymint/aidl/vts/functional/KeyMintTest.cpp
@@ -2086,7 +2086,8 @@ builder, &key_blob, &key_characteristics); } } - ASSERT_EQ(error, ErrorCode::CANNOT_ATTEST_IDS); + + device_id_attestation_check_acceptable_error(tag.tag, error); } }