From 71d19b21c30596b24ba053bfd9765528ee36901d Mon Sep 17 00:00:00 2001 From: Rajesh Nyamagoud Date: Tue, 9 May 2023 17:23:02 +0000 Subject: [PATCH] KM VTS test fix - handled "null" value for imei. Added a check to make sure IMEI is not "null". Bug: 281676499 Test: atest VtsAidlKeyMintTargetTest Change-Id: Ia1569a30412d633eee4d4de8cd00dea077d1c23d --- .../keymint/aidl/vts/functional/AttestKeyTest.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/security/keymint/aidl/vts/functional/AttestKeyTest.cpp b/security/keymint/aidl/vts/functional/AttestKeyTest.cpp index e759123334..92f7ac9dfe 100644 --- a/security/keymint/aidl/vts/functional/AttestKeyTest.cpp +++ b/security/keymint/aidl/vts/functional/AttestKeyTest.cpp @@ -80,7 +80,13 @@ string get_imei(int slot) { return ""; } - return ::android::base::Trim(out[0]); + string imei = ::android::base::Trim(out[0]); + if (imei.compare("null") == 0) { + LOG(ERROR) << "Error in getting IMEI from Telephony service: value is null. Cmd: " << cmd; + return ""; + } + + return imei; } } // namespace @@ -1059,7 +1065,7 @@ TEST_P(AttestKeyTest, SecondIMEIAttestationIDSuccess) { // Skip the test if there is no second IMEI exists. string second_imei = get_imei(1); - if (second_imei.empty() || second_imei.compare("null") == 0) { + if (second_imei.empty()) { GTEST_SKIP() << "Test not applicable as there is no second IMEI"; } @@ -1137,13 +1143,13 @@ TEST_P(AttestKeyTest, MultipleIMEIAttestationIDSuccess) { // Skip the test if there is no first IMEI exists. string imei = get_imei(0); - if (imei.empty() || imei.compare("null") == 0) { + if (imei.empty()) { GTEST_SKIP() << "Test not applicable as there is no first IMEI"; } // Skip the test if there is no second IMEI exists. string second_imei = get_imei(1); - if (second_imei.empty() || second_imei.compare("null") == 0) { + if (second_imei.empty()) { GTEST_SKIP() << "Test not applicable as there is no second IMEI"; }