tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Fix fail on RadioConfigTest#checkPortInfoExistsAndPortActive for dual-SIM detection"

Browse source
This commit is contained in:
Jayachandran C 2023-04-25 23:58:42 +00:00 committed by Gerrit Code Review
commit 569b04a197
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
radio/aidl/vts/radio_aidl_hal_utils.cpp
View file

@ -85,7 +85,7 @@ bool isSsSsEnabled() {
// Do not use checkSubstringInCommandOutput("getprop persist.radio.multisim.config", "")
// until b/148904287 is fixed. We need exact matching instead of partial matching. (i.e.
// by definition the empty string "" is a substring of any string).
return !isDsDsEnabled() && !isTsTsEnabled();
return !isDsDsEnabled() && !isTsTsEnabled() && !isDsDaEnabled();
}
bool isDsDsEnabled() {
@ -125,8 +125,8 @@ bool isServiceValidForDeviceConfiguration(std::string& serviceName) {
ALOGI("%s instance is not valid for SSSS device.", serviceName.c_str());
return false;
}
} else if (isDsDsEnabled()) {
// Device is configured as DSDS.
} else if (isDsDsEnabled() || isDsDaEnabled()) {
// Device is configured as DSDS or DSDA.
if (!stringEndsWith(serviceName, RADIO_SERVICE_SLOT1_NAME) &&
!stringEndsWith(serviceName, RADIO_SERVICE_SLOT2_NAME)) {
ALOGI("%s instance is not valid for DSDS device.", serviceName.c_str());