Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 16:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "KM VTS test fix - handled "null" value for imei." am: 95ec2cdd2f

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

Change-Id: I550d140319cea8551137d6999fd60a46bdfe7251
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-05-12 02:51:52 +00:00
committed by Automerger Merge Worker
parent d64df0bd01 95ec2cdd2f
commit 6b4a8807a5
1 changed files with 10 additions and 4 deletions
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";
}