| commit | ae09bdab0fb2eec54f4db58b7b61b099077bf944 | [log] [tgz] |
|---|---|---|
| author | David Drysdale <drysdale@google.com> | Thu Jul 13 09:41:07 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jul 13 09:41:07 2023 +0000 |
| tree | b100d7b1c6c1b04972719b6967a17bd08981528d | |
| parent | b41fbbdbec078045bb66a5b600e7938422f53a21 [diff] | |
| parent | af1ebb625021ab4503d9cb8245d0c3ce363ea803 [diff] |
Allow extra ID attestation error codes am: 3f6ab601b9 am: 4a70416566 am: 6c38c03f19 am: af1ebb6250 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2646973 Change-Id: I32116bf246c38b301f75302372ec8693a3cb4e60 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); } }