| commit | 6ffb3be9b7780f75e6d69c617e170918d67e0d80 | [log] [tgz] |
|---|---|---|
| author | Shuo Qian <shuoq@google.com> | Fri Oct 08 18:54:32 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 18:54:32 2021 +0000 |
| tree | 3b7e317c7c84d3af5a302345e35b730ff55113b6 | |
| parent | 8c858231a1d0f159c1c0946c04f2cb6871dc2b6b [diff] | |
| parent | 881eb60d013c163f98e0f9dd95f4eda774cdc45e [diff] |
Merge "Config the number of live modems based on current multisim number." am: 1ea58ef3a4 am: 881eb60d01 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1850573 Change-Id: I88169d49887ff9df1c20d133581a2e328504cef3
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());