commit ba824fe285df7f5f7a4ee55f01cd0b227b554407
author Rajesh Nyamagoud <nyamagoud@google.com> Tue May 09 17:23:02 2023 +0000
committer Cherrypicker Worker <android-build-cherrypicker-worker@google.com> Mon May 15 16:57:04 2023 +0000
tree 24cf0928b7d64aac648e0fe854fda3b4d6027b2a
parent 2047ab0aaeb14f9724af547b54c126c730a14c73

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

Added a check to make sure IMEI is not "null".

Bug: 281676499
Test: atest VtsAidlKeyMintTargetTest
(cherry picked from https://android-review.googlesource.com/q/commit:71d19b21c30596b24ba053bfd9765528ee36901d)
Merged-In: Ia1569a30412d633eee4d4de8cd00dea077d1c23d
Change-Id: Ia1569a30412d633eee4d4de8cd00dea077d1c23d

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

diff --git a/security/keymint/aidl/vts/functional/AttestKeyTest.cpp b/security/keymint/aidl/vts/functional/AttestKeyTest.cpp
index c035f19..a868c96 100644
--- a/security/keymint/aidl/vts/functional/AttestKeyTest.cpp
+++ b/security/keymint/aidl/vts/functional/AttestKeyTest.cpp
@@ -80,7 +80,13 @@
         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 @@
 
     // 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 @@
 
     // 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";
     }