commit b96b0ec88425314a477469288cb4e189795ae655
author Shuo Qian <shuoq@google.com> Mon Sep 27 12:25:10 2021 -0700
committer sqian <shuoq@google.com> Fri Oct 08 16:25:26 2021 +0000
tree ad3ec3901eed5537286ca414f83506a52a9165b0
parent 54ac1cbb35e9fe2301a3370c4e240f5d6072b9fa

Config the number of live modems based on current multisim number.

Test: atest VtsHalRadioConfigV1_1TargetTest
Bug: 200889748
Change-Id: If2aca6add38b801be011797c1da4c8de32f1bef6
Merged-In: If2aca6add38b801be011797c1da4c8de32f1bef6
(cherry picked from commit 400ce4ff762d88add1798bfc2e89661143902060)

radio/config/1.1/vts/functional/radio_config_hidl_hal_api.cpp

diff --git a/radio/config/1.1/vts/functional/radio_config_hidl_hal_api.cpp b/radio/config/1.1/vts/functional/radio_config_hidl_hal_api.cpp
index 49c7aad..40069bf 100644
--- a/radio/config/1.1/vts/functional/radio_config_hidl_hal_api.cpp
+++ b/radio/config/1.1/vts/functional/radio_config_hidl_hal_api.cpp
@@ -58,7 +58,16 @@
 TEST_P(RadioConfigHidlTest, setModemsConfig_goodRequest) {
     serial = GetRandomSerialNumber();
     ModemsConfig* mConfig = new ModemsConfig();
-    mConfig->numOfLiveModems = 1;
+    if (isSsSsEnabled()) {
+        mConfig->numOfLiveModems = 1;
+    } else if (isDsDsEnabled()) {
+        mConfig->numOfLiveModems = 2;
+    } else if (isTsTsEnabled()) {
+        mConfig->numOfLiveModems = 3;
+    } else {
+        ALOGI("Skipping setModemsConfig_goodRequest, unsupported multisim number");
+        return;
+    }
     Return<void> res = radioConfig->setModemsConfig(serial, *mConfig);
     ASSERT_OK(res);
     EXPECT_EQ(std::cv_status::no_timeout, wait());