Merge "Adding DSDA configuration for VTS." am: 202c44bbdc am: 34aa930c29

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

Change-Id: I1d10e7a04b255774b8ad5dc93107ac6d593c91a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-11-10 13:07:34 +00:00
committed by Automerger Merge Worker
3 changed files with 11 additions and 2 deletions

View File

@@ -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");
}

View File

@@ -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).
*/

View File

@@ -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);