commit 961b3dccde959dcbeaa02f82cf76881a1c1e2687
author Zhang Yuan <zhang.yuan3@zte.com.cn> Tue Apr 11 16:35:41 2023 +0800
committer Jayachandran C <jayachandranc@google.com> Tue Apr 25 21:14:42 2023 +0000
tree 20331f52024351110855c278af2a1caa5ec94a5c
parent 2d79edf1d8037beead112661c23eb655151f0afa

Fix fail on RadioConfigTest#checkPortInfoExistsAndPortActive for dual-SIM detection

The code currently uses 'dsds' to detect dual-SIM configurations,
but it misses 'dsda' configurations, resulting in test failures.
Should use the detection mechanism by adding handling for 'dsda',
ensuring accurate detection of all dual-SIM configurations.

Bug: 277705768
Test: vts -m VtsHalRadioTargetTest -t PerInstance/RadioConfigTest#checkPortInfoExistsAndPortActive/0_android_hardware_radio_config_IRadioConfig_default

Change-Id: Ie73a958ff14e86f440831e18291b6599b6eac30b
Signed-off-by: Jia Jia <jia.jia@zte.com.cn>

radio/aidl/vts/radio_aidl_hal_utils.cpp

diff --git a/radio/aidl/vts/radio_aidl_hal_utils.cpp b/radio/aidl/vts/radio_aidl_hal_utils.cpp
index 6ed8e7d..f18da55 100644
--- a/radio/aidl/vts/radio_aidl_hal_utils.cpp
+++ b/radio/aidl/vts/radio_aidl_hal_utils.cpp
@@ -85,7 +85,7 @@
     // 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 @@
             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());