commit a720f2134e718ec029a39dfbfc9d8c4d7c9aa2e6
author Shuo Qian <shuoq@google.com> Tue Sep 28 17:53:51 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Sep 28 17:53:51 2021 +0000
tree 85654615028634b996a4559b5cbb96b7a48e5c58
parent 0bb25440965402715fbe6e2b59f5240d63e566e2
parent 400ce4ff762d88add1798bfc2e89661143902060

Config the number of live modems based on current multisim number. am: 400ce4ff76

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

Change-Id: Ia9d077e3db491e5546d7899b4c757a6addd3d509

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