From 2910082f89fc723e6dac6af017a04e0d19d92275 Mon Sep 17 00:00:00 2001
From: Zhang Yuan <zhang.yuan3@zte.com.cn>
Date: Thu, 20 Oct 2022 16:39:19 +0800
Subject: [PATCH] Adding DSDA configuration for VTS.

Some of the devices which supports DSDA configuration is failing with IRadioConfig.setSimSlotsMapping() VTS. Hence improving the Test case to support.
Test: atest VtsHalRadioTargetTest
Bug: 253337352

Change-Id: I66314124dbf410d8344025aa45529652e126368a
---
 radio/aidl/vts/radio_aidl_hal_utils.cpp | 4 ++++
 radio/aidl/vts/radio_aidl_hal_utils.h   | 5 +++++
 radio/aidl/vts/radio_config_test.cpp    | 4 ++--
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/radio/aidl/vts/radio_aidl_hal_utils.cpp b/radio/aidl/vts/radio_aidl_hal_utils.cpp
index efc4f26dad..6ed8e7d762 100644
--- a/radio/aidl/vts/radio_aidl_hal_utils.cpp
+++ b/radio/aidl/vts/radio_aidl_hal_utils.cpp
@@ -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");
 }
diff --git a/radio/aidl/vts/radio_aidl_hal_utils.h b/radio/aidl/vts/radio_aidl_hal_utils.h
index 47976b9099..8170a0114b 100644
--- a/radio/aidl/vts/radio_aidl_hal_utils.h
+++ b/radio/aidl/vts/radio_aidl_hal_utils.h
@@ -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).
  */
diff --git a/radio/aidl/vts/radio_config_test.cpp b/radio/aidl/vts/radio_config_test.cpp
index 258b172918..c979d28781 100644
--- a/radio/aidl/vts/radio_config_test.cpp
+++ b/radio/aidl/vts/radio_config_test.cpp
@@ -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);