Merge "VTS workaround for RadioSimTest#setAllowedCarriers" into main (a106f0f3) · Commits · e / os / android_hardware_interfaces

radio/aidl/compat/libradiocompat/sim/structs.cpp

+40 −6

Original line number	Diff line number	Diff line
		@@ -70,26 +70,60 @@ V1_0::Carrier toHidl(const aidl::Carrier& carrier) {
		};
		}

		static aidl::CarrierInfo toCarrierInfo(const aidl::Carrier& carrier) {
		return {
		.mcc = carrier.mcc,
		.mnc = carrier.mnc,
		};
		}

		static std::vector<aidl::CarrierInfo> toCarrierInfos(const std::vector<aidl::Carrier>& carriers) {
		std::vector<aidl::CarrierInfo> infos(carriers.size());
		for (size_t i = 0; i < carriers.size(); i++) {
		infos[i] = toCarrierInfo(carriers[i]);
		}
		return infos;
		}

		V1_0::Carrier toHidl(const aidl::CarrierInfo& carrierInfo) {
		return {
		.mcc = carrierInfo.mcc,
		.mnc = carrierInfo.mnc,
		};
		}

		aidl::CarrierRestrictions toAidl(const V1_0::CarrierRestrictions& cr) {
		auto allowedCarriers = toAidl(cr.allowedCarriers);
		auto excludedCarriers = toAidl(cr.excludedCarriers);
		return {
		.allowedCarriers = toAidl(cr.allowedCarriers),
		.excludedCarriers = toAidl(cr.excludedCarriers),
		.allowedCarriers = allowedCarriers,
		.excludedCarriers = excludedCarriers,
		.allowedCarriersPrioritized = true,
		.allowedCarrierInfoList = toCarrierInfos(allowedCarriers),
		.excludedCarrierInfoList = toCarrierInfos(excludedCarriers),
		};
		}

		aidl::CarrierRestrictions toAidl(const V1_4::CarrierRestrictionsWithPriority& cr) {
		auto allowedCarriers = toAidl(cr.allowedCarriers);
		auto excludedCarriers = toAidl(cr.excludedCarriers);
		return {
		.allowedCarriers = toAidl(cr.allowedCarriers),
		.excludedCarriers = toAidl(cr.excludedCarriers),
		.allowedCarriers = allowedCarriers,
		.excludedCarriers = excludedCarriers,
		.allowedCarriersPrioritized = cr.allowedCarriersPrioritized,
		.allowedCarrierInfoList = toCarrierInfos(allowedCarriers),
		.excludedCarrierInfoList = toCarrierInfos(excludedCarriers),
		};
		}

		V1_4::CarrierRestrictionsWithPriority toHidl(const aidl::CarrierRestrictions& cr) {
		return {
		.allowedCarriers = toHidl(cr.allowedCarriers),
		.excludedCarriers = toHidl(cr.excludedCarriers),
		.allowedCarriers = (cr.allowedCarriers.size() > cr.allowedCarrierInfoList.size())
		? toHidl(cr.allowedCarriers)
		: toHidl(cr.allowedCarrierInfoList),
		.excludedCarriers = (cr.excludedCarriers.size() > cr.excludedCarrierInfoList.size())
		? toHidl(cr.excludedCarriers)
		: toHidl(cr.excludedCarrierInfoList),
		.allowedCarriersPrioritized = cr.allowedCarriersPrioritized,
		};
		}

radio/aidl/compat/libradiocompat/sim/structs.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -37,6 +37,7 @@ V1_0::SimApdu toHidl(const ::aidl::android::hardware::radio::sim::SimApdu& apdu)

		::aidl::android::hardware::radio::sim::Carrier toAidl(const V1_0::Carrier& carrier);
		V1_0::Carrier toHidl(const ::aidl::android::hardware::radio::sim::Carrier& carrier);
		V1_0::Carrier toHidl(const ::aidl::android::hardware::radio::sim::CarrierInfo& carrierInfo);

		::aidl::android::hardware::radio::sim::CarrierRestrictions //
		toAidl(const V1_0::CarrierRestrictions& cr);

radio/aidl/vts/radio_sim_test.cpp

+15 −11

Original line number	Diff line number	Diff line
		@@ -485,8 +485,10 @@ TEST_P(RadioSimTest, setAllowedCarriers) {
		} else {
		carrierRestrictions.allowedCarrierInfoList.resize(1);
		carrierRestrictions.excludedCarrierInfoList.resize(0);
		carrierRestrictions.allowedCarrierInfoList[0].mcc = std::string("321");
		carrierRestrictions.allowedCarrierInfoList[0].mnc = std::string("654");
		// TODO(b/365568518): change mcc/mnc to something else once CF fully supports
		// setAllowedCarriers
		carrierRestrictions.allowedCarrierInfoList[0].mcc = std::string("123");
		carrierRestrictions.allowedCarrierInfoList[0].mnc = std::string("456");
		carrierRestrictions.allowedCarrierInfoList[0].spn = std::string("TestNetwork");
		carrierRestrictions.allowedCarrierInfoList[0].gid1 = std::string("BAE000000000000");
		carrierRestrictions.allowedCarrierInfoList[0].gid2 = std::string("AE0000000000000");
		@@ -517,7 +519,7 @@ TEST_P(RadioSimTest, setAllowedCarriers) {
		sleep(2);
		updateSimCardStatus();
		}
		// TODO: uncomment once CF fully supports setAllowedCarriers
		// TODO(b/365568518): uncomment once CF fully supports setAllowedCarriers
		// EXPECT_EQ(CardStatus::STATE_RESTRICTED, cardStatus.cardState);
		}

		@@ -545,19 +547,21 @@ TEST_P(RadioSimTest, setAllowedCarriers) {
		} else {
		ASSERT_EQ(1, radioRsp_sim->carrierRestrictionsResp.allowedCarrierInfoList.size());
		EXPECT_EQ(0, radioRsp_sim->carrierRestrictionsResp.excludedCarrierInfoList.size());
		ASSERT_TRUE(std::string("321") ==
		ASSERT_EQ(std::string("123"),
		radioRsp_sim->carrierRestrictionsResp.allowedCarrierInfoList[0].mcc);
		ASSERT_TRUE(std::string("654") ==
		ASSERT_EQ(std::string("456"),
		radioRsp_sim->carrierRestrictionsResp.allowedCarrierInfoList[0].mnc);
		ASSERT_TRUE(std::string("BAE000000000000") ==
		#if 0 // TODO(b/365568518): enable once CF fully supports setAllowedCarriers
		ASSERT_EQ(std::string("BAE000000000000"),
		radioRsp_sim->carrierRestrictionsResp.allowedCarrierInfoList[0].gid1);
		ASSERT_TRUE(std::string("AE0000000000000") ==
		ASSERT_EQ(std::string("AE0000000000000"),
		radioRsp_sim->carrierRestrictionsResp.allowedCarrierInfoList[0].gid2);
		ASSERT_TRUE(std::string("9987") ==
		ASSERT_EQ(std::string("9987"),
		radioRsp_sim->carrierRestrictionsResp.allowedCarrierInfoList[0].imsiPrefix);
		ASSERT_TRUE(radioRsp_sim->carrierRestrictionsResp.allowedCarriersPrioritized);
		EXPECT_EQ(CarrierRestrictions::CarrierRestrictionStatus::RESTRICTED,
		radioRsp_sim->carrierRestrictionsResp.status);
		#endif
		ASSERT_TRUE(radioRsp_sim->carrierRestrictionsResp.allowedCarriersPrioritized);
		EXPECT_EQ(SimLockMultiSimPolicy::NO_MULTISIM_POLICY, radioRsp_sim->multiSimPolicyResp);
		}
		sleep(10);