Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8be4892 authored by Eran Messeri's avatar Eran Messeri Committed by Automerger Merge Worker
Browse files

Merge "KM VTS test fix - handled "null" value for imei." into udc-dev am: 0b48df3a 

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



Change-Id: I6373511035d2b79b26bbe68371374d165d683797
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6e6ce565 0b48df3a

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

+10 −4
Original line number Original line Diff line number Diff line
@@ -80,7 +80,13 @@ string get_imei(int slot) { 
        return "";

        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

}  // namespace
@@ -972,7 +978,7 @@ TEST_P(AttestKeyTest, SecondIMEIAttestationIDSuccess) { 




    // Skip the test if there is no second IMEI exists.

    // Skip the test if there is no second IMEI exists.

    string second_imei = get_imei(1);

    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";

        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.

    // Skip the test if there is no first IMEI exists.

    string imei = get_imei(0);

    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";

        GTEST_SKIP() << "Test not applicable as there is no first IMEI";

    }

    }





    // Skip the test if there is no second IMEI exists.

    // Skip the test if there is no second IMEI exists.

    string second_imei = get_imei(1);

    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";

        GTEST_SKIP() << "Test not applicable as there is no second IMEI";

    }

    }