VTS workaround for RadioSimTest#setAllowedCarriers
This change fixes setAllowedCarriers test enough for VTS to pass on CF:
- update libradiocompat to support new fields allowedCarrierInfoList
and excludedCarrierInfoList
- update radio VTS to use the same MCC and MNC as the one used by CF HAL
(this was never properly tested, needs to be fixed later)
- update radio VTS to not test fields unsupported by CF HAL
(this needs to be re-enabled later)
This test was broken by change I940fd4ecdc70cb4e31802cefc1ae1d02436ffe90
but never catched due to VTS being disabled for CF on TreeHugger.
Bug: 365568518
Test: atest VtsHalRadioTargetTest
Change-Id: Iea8e771eb6d7982220a0f2b6522467397d87f2ce
diff --git a/radio/aidl/compat/libradiocompat/sim/structs.h b/radio/aidl/compat/libradiocompat/sim/structs.h
index 54099b7..7774bee 100644
--- a/radio/aidl/compat/libradiocompat/sim/structs.h
+++ b/radio/aidl/compat/libradiocompat/sim/structs.h
@@ -37,6 +37,7 @@
::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);