commit | b3c2c732352fdfa04f508e1e81371a7f0aff70f1 | [log] [tgz] |
---|---|---|
author | David Drysdale <drysdale@google.com> | Thu Jul 06 14:41:10 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jul 06 14:41:10 2023 +0000 |
tree | de79b6192079e1f308448eac87a34f0fa2d8c1b3 | |
parent | f566028519bf166aa41e966444423e0122fce1b8 [diff] | |
parent | 6bdbc50bf4358a4feff225fe2375e2b1ced050a6 [diff] |
Allow extra ID attestation error codes am: c68dc93788 am: c67f8ef755 am: caaedb0a79 am: 5fa61b6df6 am: 59ff4ad69b am: 6bdbc50bf4 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2646791 Change-Id: I2ecf3c6faf845c9fb7dd6852f371198515579294 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); } }