commit 4d2d6ea1ba3cb9748de194167832b01c00f69ae9
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Aug 06 21:46:24 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Aug 06 21:46:24 2024 +0000
tree cc66d5e492b089a47964098f89c99c72de27349c
parent 41ae0f4527bbc6fbea249a4ac0ff6ffe34479c44
parent 1a07256b4ba69df06ddbe9eda61ddf1778729604

Merge "update vts setSimCardPower test cases to handle  different MEP types Bug: 351698476 Test: atest VtsHalRadioTargetTest" into android14-tests-dev am: 1a07256b4b

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

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

radio/aidl/vts/radio_sim_test.cpp

diff --git a/radio/aidl/vts/radio_sim_test.cpp b/radio/aidl/vts/radio_sim_test.cpp
index d906588..ec16bc5 100644
--- a/radio/aidl/vts/radio_sim_test.cpp
+++ b/radio/aidl/vts/radio_sim_test.cpp
@@ -111,7 +111,14 @@
         EXPECT_EQ(CardStatus::STATE_PRESENT, slotStatus.cardState);
         if (CardStatus::STATE_PRESENT == slotStatus.cardState) {
             ASSERT_TRUE(slotStatus.portInfo[0].portActive);
-            EXPECT_EQ(0, cardStatus.slotMap.portId);
+            if (cardStatus.supportedMepMode == aidl::android::hardware::radio::config::
+                                                       MultipleEnabledProfilesMode::MEP_A1 ||
+                cardStatus.supportedMepMode == aidl::android::hardware::radio::config::
+                                                       MultipleEnabledProfilesMode::MEP_A2) {
+                EXPECT_EQ(1, cardStatus.slotMap.portId);
+            } else {
+                EXPECT_EQ(0, cardStatus.slotMap.portId);
+            }
         }
     }
 }