tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "KM VTS test fix - handled "null" value for imei."

Browse source
This commit is contained in:
Treehugger Robot 2023-05-12 02:44:22 +00:00 committed by Gerrit Code Review
commit 95ec2cdd2f
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
security/keymint/aidl/vts/functional/AttestKeyTest.cpp
View file

@ -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
@ -972,7 +978,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";
}
@ -1050,13 +1056,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";
}