Merge "KeyMint: version gate attestation of IMEI2" into main

This commit is contained in:
David Drysdale
2024-06-12 09:57:28 +00:00
committed by Gerrit Code Review

View File

@@ -2059,7 +2059,7 @@ TEST_P(NewKeyGenerationTest, EcdsaAttestationIdTags) {
extra_tags.Authorization(TAG_ATTESTATION_ID_IMEI, imei.data(), imei.size());
}
string second_imei = get_imei(1);
if (!second_imei.empty()) {
if (!second_imei.empty() && isSecondImeiIdAttestationRequired()) {
extra_tags.Authorization(TAG_ATTESTATION_ID_SECOND_IMEI, second_imei.data(),
second_imei.size());
}
@@ -2135,7 +2135,7 @@ TEST_P(NewKeyGenerationTest, EcdsaAttestationIdAllTags) {
extra_tags.Authorization(TAG_ATTESTATION_ID_IMEI, imei.data(), imei.size());
}
string second_imei = get_imei(1);
if (!second_imei.empty()) {
if (!second_imei.empty() && isSecondImeiIdAttestationRequired()) {
extra_tags.Authorization(TAG_ATTESTATION_ID_SECOND_IMEI, second_imei.data(),
second_imei.size());
}