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
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);
+ }
}
}
}
diff --git a/tv/input/aidl/vts/functional/VtsHalTvInputTargetTest.cpp b/tv/input/aidl/vts/functional/VtsHalTvInputTargetTest.cpp
index 8d3395b..90404f6 100644
--- a/tv/input/aidl/vts/functional/VtsHalTvInputTargetTest.cpp
+++ b/tv/input/aidl/vts/functional/VtsHalTvInputTargetTest.cpp
@@ -135,13 +135,15 @@
}
bool TvInputAidlTest::isValidHandle(NativeHandle& handle) {
- if (handle.fds.empty()) {
+ if (handle.fds.empty() && handle.ints.empty()) {
return false;
}
- for (size_t i = 0; i < handle.fds.size(); i++) {
- int fd = handle.fds[i].get();
- if (fcntl(fd, F_GETFL) < 0) {
- return false;
+ if (!(handle.fds.empty())) {
+ for (size_t i = 0; i < handle.fds.size(); i++) {
+ int fd = handle.fds[i].get();
+ if (fcntl(fd, F_GETFL) < 0) {
+ return false;
+ }
}
}
return true;