| commit | 6bdbc50bf4358a4feff225fe2375e2b1ced050a6 | [log] [tgz] |
|---|---|---|
| author | David Drysdale <drysdale@google.com> | Thu Jul 06 13:54:53 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jul 06 13:54:53 2023 +0000 |
| tree | ddd3475e9f999ff36e1cf5d5de5667817c95a11b | |
| parent | 273be36b0ca912e8412fafe743a821af00b0ef53 [diff] | |
| parent | 59ff4ad69b7fde9a7129d52ad91e1c413cfe29d3 [diff] |
Allow extra ID attestation error codes am: c68dc93788 am: c67f8ef755 am: caaedb0a79 am: 5fa61b6df6 am: 59ff4ad69b Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2646791 Change-Id: Ie224bdfe4fb92f5878dd14b3925dc11c1255e7df 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 051ace4..1e61a18 100644 --- a/security/keymint/aidl/vts/functional/KeyMintTest.cpp +++ b/security/keymint/aidl/vts/functional/KeyMintTest.cpp
@@ -2070,7 +2070,8 @@ builder, &key_blob, &key_characteristics); } } - ASSERT_EQ(error, ErrorCode::CANNOT_ATTEST_IDS); + + device_id_attestation_check_acceptable_error(tag.tag, error); } }