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

Commit 187f77c8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "KM VTS test fix - handled "null" value for imei." am: 95ec2cdd am: 6b4a8807 am: 64369644 am: ef1d68d6 am: c8863038 am: e50a550c

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



Change-Id: I2fb05e76aff3c54fb62ac6d2697100551bfc1b9b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3626c3ac e50a550c

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

+10 −4
Original line number Diff line number Diff line
@@ -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";

    }