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