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

Commit 202c44bb authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Adding DSDA configuration for VTS."

parents 9cce6228 2910082f

radio/aidl/vts/radio_aidl_hal_utils.cpp

+4 −0
Original line number Diff line number Diff line
@@ -92,6 +92,10 @@ bool isDsDsEnabled() { 
    return testing::checkSubstringInCommandOutput("getprop persist.radio.multisim.config", "dsds");

}



bool isDsDaEnabled() {

    return testing::checkSubstringInCommandOutput("getprop persist.radio.multisim.config", "dsda");

}



bool isTsTsEnabled() {

    return testing::checkSubstringInCommandOutput("getprop persist.radio.multisim.config", "tsts");

}

radio/aidl/vts/radio_aidl_hal_utils.h

+5 −0
Original line number Diff line number Diff line
@@ -103,6 +103,11 @@ bool isSsSsEnabled(); 
 */

bool isDsDsEnabled();



/*

 * Check if device is in DSDA (Dual SIM Dual Active).

 */

bool isDsDaEnabled();



/*

 * Check if device is in TSTS (Triple SIM Triple Standby).

 */

radio/aidl/vts/radio_config_test.cpp

+2 −2
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ TEST_P(RadioConfigTest, setSimSlotsMapping) { 
        slotPortMapping.physicalSlotId = -1;

        slotPortMapping.portId = -1;

        std::vector<SlotPortMapping> slotPortMappingList = {slotPortMapping};

        if (isDsDsEnabled()) {

        if (isDsDsEnabled() || isDsDaEnabled()) {

            slotPortMappingList.push_back(slotPortMapping);

        } else if (isTsTsEnabled()) {

            slotPortMappingList.push_back(slotPortMapping);
@@ -252,7 +252,7 @@ TEST_P(RadioConfigTest, checkPortInfoExistsAndPortActive) { 
        }

        if (isSsSsEnabled()) {

            EXPECT_EQ(1, simCount);

        } else if (isDsDsEnabled()) {

        } else if (isDsDsEnabled() || isDsDaEnabled()) {

            EXPECT_EQ(2, simCount);

        } else if (isTsTsEnabled()) {

            EXPECT_EQ(3, simCount);