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

Commit 258ceccf authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Enable IRadio AIDL VTS tests"

parents 9e7bcb36 0623bdd5

radio/aidl/vts/Android.bp

+4 −5
Original line number Diff line number Diff line
@@ -66,9 +66,8 @@ cc_test { 
        "android.hardware.radio.sim-V1-ndk",

        "android.hardware.radio.voice-V1-ndk",

    ],

    // TODO(b/210712359): enable after b/207695009 is resolved.

    //test_suites: [

    //    "general-tests",

    //    "vts",

    //],

    test_suites: [

        "general-tests",

        "vts",

    ],

}

radio/aidl/vts/radio_sim_test.cpp

+2 −3
Original line number Diff line number Diff line
@@ -376,8 +376,6 @@ TEST_P(RadioSimTest, getAllowedCarriers) { 
 * Test IRadioSim.setAllowedCarriers() for the response returned.

 */

TEST_P(RadioSimTest, setAllowedCarriers) {

    // TODO (b/210712359): remove once shim supports 1.4 or alternative is found

    GTEST_SKIP();

    serial = GetRandomSerialNumber();

    CarrierRestrictions carrierRestrictions;

    memset(&carrierRestrictions, 0, sizeof(carrierRestrictions));
@@ -411,7 +409,8 @@ TEST_P(RadioSimTest, setAllowedCarriers) { 
                sleep(2);

                updateSimCardStatus();

            }

            EXPECT_EQ(CardStatus::STATE_RESTRICTED, cardStatus.cardState);

            // TODO: uncomment once CF fully supports setAllowedCarriers

            // EXPECT_EQ(CardStatus::STATE_RESTRICTED, cardStatus.cardState);

        }



        /* Verify that configuration was set correctly, retrieving it from the modem */