commit c9fb8e8f147681bef90e85aa92efd44d548880ca
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Aug 07 09:06:08 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Aug 07 09:06:08 2024 +0000
tree cac37998994956f365362348de1db5273a26a613
parent a3a2f50b3cf075472fd9ec992ae4af3b618150f7
parent 21f51188eb7e3529b47e0ed4996faec9e2c1e52f

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 am: 3d9d5d8530 am: ae3c6f852f am: 21f51188eb

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

Change-Id: If2e109006bdf7eb93b13e6c9168d21c63acd2478
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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;
+                        }
                     }
                 }
             }