commit 3d9d5d8530b915158786bb8efb8f7cc20567e1f4
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Aug 07 08:21:21 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Aug 07 08:21:21 2024 +0000
tree 09ace3e69972961986e423b0ee305c247cc4f4fa
parent 1a07256b4ba69df06ddbe9eda61ddf1778729604
parent 5ac83a65d008f2c93e836a376ef111481ce7a9bc

Merge "update vts setSimSlotMapping test cases to handle  different MEP types Bug: 342543877 Test: atest PerInstance/RadioConfigTest#setSimSlotsMapping/0_android_hardware_radio_config_IRadioConfig_default" into android14-tests-dev

radio/aidl/vts/radio_config_test.cpp

diff --git a/radio/aidl/vts/radio_config_test.cpp b/radio/aidl/vts/radio_config_test.cpp
index aed3b05..0175a4c 100644
--- a/radio/aidl/vts/radio_config_test.cpp
+++ b/radio/aidl/vts/radio_config_test.cpp
@@ -194,7 +194,14 @@
                     EXPECT_LT(logicalSlotId, slotPortMappingList.size());
                     if (logicalSlotId >= 0 && logicalSlotId < slotPortMappingList.size()) {
                         slotPortMappingList[logicalSlotId].physicalSlotId = i;
-                        slotPortMappingList[logicalSlotId].portId = j;
+                        if (radioRsp_config->simSlotStatus[i].supportedMepMode ==
+                                    MultipleEnabledProfilesMode::MEP_A1 ||
+                            radioRsp_config->simSlotStatus[i].supportedMepMode ==
+                                    MultipleEnabledProfilesMode::MEP_A2) {
+                            slotPortMappingList[logicalSlotId].portId = j + 1;
+                        } else {
+                            slotPortMappingList[logicalSlotId].portId = j;
+                        }
                     }
                 }
             }