commit e10b12929c70e3b9a01b02a0a2c514ea7176ec52
author David Drysdale <drysdale@google.com> Wed Jun 12 10:19:30 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jun 12 10:19:30 2024 +0000
tree e66ee4546fff75b9e71b724e0ecf163355d1e4cc
parent 7bcd9c7b130b7738ffbff935457fe8e8d9bca7df
parent 54db6b22144821d818bc9f0cd13ed8cebb29d7b7

Merge "KeyMint: version gate attestation of IMEI2" into main am: 54db6b2214

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3125954

Change-Id: I0f73da5fbf1274e8555f493d3b408f9b29fbb963
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

security/keymint/aidl/vts/functional/KeyMintTest.cpp

diff --git a/security/keymint/aidl/vts/functional/KeyMintTest.cpp b/security/keymint/aidl/vts/functional/KeyMintTest.cpp
index 3c49a82..527b5e0 100644
--- a/security/keymint/aidl/vts/functional/KeyMintTest.cpp
+++ b/security/keymint/aidl/vts/functional/KeyMintTest.cpp
@@ -2059,7 +2059,7 @@
         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 @@
         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());
     }