[QNS] use carrier config KEY_XCAP_OVER_UT_SUPPORTED_RATS_INT_ARRAY

Replace KEY_QNS_XCAP_TRANSPORT_TYPE_INT with
KEY_XCAP_OVER_UT_SUPPORTED_RATS_INT_ARRAY (AOSP carrier Config)

Bug: 237502693
Test: atest QualifiedNetworksServiceTests
Change-Id: Ifc77a782c548287ae3c8e15fbdaaba5bcad737ab

71 files changed, 95 insertions, 141 deletions

diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_10002_O2Prepaid-GB.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_10002_O2Prepaid-GB.xml
index be72261..cc4c410 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_10002_O2Prepaid-GB.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_10002_O2Prepaid-GB.xml
@@ -2,5 +2,4 @@
 <carrier_config>
     <int name="qns.mms_rat_preference_int" value="3"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
 </carrier_config>
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_10025_Roger5g-CA.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_10025_Roger5g-CA.xml
index f7e8737..0633e46 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_10025_Roger5g-CA.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_10025_Roger5g-CA.xml
@@ -14,7 +14,6 @@
     </int-array>
     <int name="qns.mms_rat_preference_int" value="2"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
     <int-array name="qns.video_wifi_rssi_int_array" num="2">
         <item value="-65"/>
         <item value="-78"/>
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_1187_AT&T.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_1187_AT&T.xml
index 3fa0c34..3e42159 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_1187_AT&T.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_1187_AT&T.xml
@@ -6,7 +6,6 @@
     <int name="qns.wifi_rssi_thresholdbackhaul_timer_int" value="0"/>
     <int name="qns.sos_transport_type_int" value="2"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
     <int name="qns.xcap_rat_preference_int" value="3"/>
     <int name="qns.mms_rat_preference_int" value="3"/>
     <int-array name="qns.rtp_metrics_int_array" num="4">
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_1344_H3-AT.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_1344_H3-AT.xml
index 87bef1d..7a6caa0 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_1344_H3-AT.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_1344_H3-AT.xml
@@ -15,7 +15,6 @@
     <boolean name="qns.override_cell_pref_to_ims_pref_home" value="true" />
     <int name="qns.mms_rat_preference_int" value="3"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
     <int-array name="qns.idle_eutran_rsrp_int_array" num="2">
         <item value="-108"/>
         <item value="-115"/>
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_1345_Telstra-AU.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_1345_Telstra-AU.xml
index 3812a3b..2413d82 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_1345_Telstra-AU.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_1345_Telstra-AU.xml
@@ -2,7 +2,6 @@
 <carrier_config>
     <int name="qns.mms_rat_preference_int" value="2"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
     <int-array name="qns.idle_eutran_rsrp_int_array" num="2">
         <item value="-110"/>
         <item value="-118"/>
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_1403_Roger-CA.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_1403_Roger-CA.xml
index f7e8737..0633e46 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_1403_Roger-CA.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_1403_Roger-CA.xml
@@ -14,7 +14,6 @@
     </int-array>
     <int name="qns.mms_rat_preference_int" value="2"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
     <int-array name="qns.video_wifi_rssi_int_array" num="2">
         <item value="-65"/>
         <item value="-78"/>
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_1404_Telus-CA.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_1404_Telus-CA.xml
index 57fcbc3..f7fd607 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_1404_Telus-CA.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_1404_Telus-CA.xml
@@ -8,7 +8,6 @@
     </string-array>
     <int name="qns.mms_rat_preference_int" value="2"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
     <int-array name="qns.idle_eutran_rsrp_int_array" num="2">
         <item value="-106"/>
         <item value="-116"/>
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_1413_Sunrise-CH.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_1413_Sunrise-CH.xml
index 5228b76..fdd0dcd 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_1413_Sunrise-CH.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_1413_Sunrise-CH.xml
@@ -3,5 +3,4 @@
     <int name="qns.sos_transport_type_int" value="2"/>
     <int name="qns.mms_rat_preference_int" value="3"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
 </carrier_config>
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_1463_TDC-DK.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_1463_TDC-DK.xml
index be72261..cc4c410 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_1463_TDC-DK.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_1463_TDC-DK.xml
@@ -2,5 +2,4 @@
 <carrier_config>
     <int name="qns.mms_rat_preference_int" value="3"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
 </carrier_config>
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_1464_Telenor-DK.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_1464_Telenor-DK.xml
index b1e7d2a..be4c547 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_1464_Telenor-DK.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_1464_Telenor-DK.xml
@@ -3,5 +3,4 @@
     <int name="qns.xcap_rat_preference_int" value="2"/>
     <int name="qns.mms_rat_preference_int" value="3"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
 </carrier_config>
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_1466_Three-DK.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_1466_Three-DK.xml
index b1e7d2a..be4c547 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_1466_Three-DK.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_1466_Three-DK.xml
@@ -3,5 +3,4 @@
     <int name="qns.xcap_rat_preference_int" value="2"/>
     <int name="qns.mms_rat_preference_int" value="3"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
 </carrier_config>
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_1492_O2Postpaid-GB.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_1492_O2Postpaid-GB.xml
index be72261..cc4c410 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_1492_O2Postpaid-GB.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_1492_O2Postpaid-GB.xml
@@ -2,5 +2,4 @@
 <carrier_config>
     <int name="qns.mms_rat_preference_int" value="3"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
 </carrier_config>
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_14_A1-AT.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_14_A1-AT.xml
index be72261..cc4c410 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_14_A1-AT.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_14_A1-AT.xml
@@ -2,5 +2,4 @@
 <carrier_config>
     <int name="qns.mms_rat_preference_int" value="3"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
 </carrier_config>
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_1573_Windtre_IT.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_1573_Windtre_IT.xml
index be72261..cc4c410 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_1573_Windtre_IT.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_1573_Windtre_IT.xml
@@ -2,5 +2,4 @@
 <carrier_config>
     <int name="qns.mms_rat_preference_int" value="3"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
 </carrier_config>
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_1575_VeryMobile-IT.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_1575_VeryMobile-IT.xml
index be72261..cc4c410 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_1575_VeryMobile-IT.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_1575_VeryMobile-IT.xml
@@ -2,5 +2,4 @@
 <carrier_config>
     <int name="qns.mms_rat_preference_int" value="3"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
 </carrier_config>
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_1595_Swisscom-LI.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_1595_Swisscom-LI.xml
index 18a8676..db16b95 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_1595_Swisscom-LI.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_1595_Swisscom-LI.xml
@@ -2,7 +2,6 @@
 <carrier_config>
     <int name="qns.mms_rat_preference_int" value="3"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
     <int-array name="qns.ims_wwan_hysteresis_timer_ms_int_array" num="3">
         <item value="120000"/>
         <item value="120000"/>
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_15_Vodafone-AU.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_15_Vodafone-AU.xml
index c022195..7f3dbb4 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_15_Vodafone-AU.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_15_Vodafone-AU.xml
@@ -3,7 +3,6 @@
     <boolean name="qns.block_iwlan_in_international_roaming_without_wwan_bool" value="true"/>
     <int name="qns.mms_rat_preference_int" value="3"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
     <int-array name="qns.idle_eutran_rsrp_int_array" num="2">
         <item value="-104"/>
         <item value="-113"/>
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_1644_KPN-NL.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_1644_KPN-NL.xml
index be72261..cc4c410 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_1644_KPN-NL.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_1644_KPN-NL.xml
@@ -2,5 +2,4 @@
 <carrier_config>
     <int name="qns.mms_rat_preference_int" value="3"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
 </carrier_config>
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_1690_Telia-SE.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_1690_Telia-SE.xml
index be72261..cc4c410 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_1690_Telia-SE.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_1690_Telia-SE.xml
@@ -2,5 +2,4 @@
 <carrier_config>
     <int name="qns.mms_rat_preference_int" value="3"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
 </carrier_config>
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_1691_H3-SE.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_1691_H3-SE.xml
index b1e7d2a..be4c547 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_1691_H3-SE.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_1691_H3-SE.xml
@@ -3,5 +3,4 @@
     <int name="qns.xcap_rat_preference_int" value="2"/>
     <int name="qns.mms_rat_preference_int" value="3"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
 </carrier_config>
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_1695_Telenor-SE.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_1695_Telenor-SE.xml
index be72261..cc4c410 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_1695_Telenor-SE.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_1695_Telenor-SE.xml
@@ -2,5 +2,4 @@
 <carrier_config>
     <int name="qns.mms_rat_preference_int" value="3"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
 </carrier_config>
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_1696_Tele2-SE.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_1696_Tele2-SE.xml
index 5228b76..fdd0dcd 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_1696_Tele2-SE.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_1696_Tele2-SE.xml
@@ -3,5 +3,4 @@
     <int name="qns.sos_transport_type_int" value="2"/>
     <int name="qns.mms_rat_preference_int" value="3"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
 </carrier_config>
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_16_Swisscom.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_16_Swisscom.xml
index 18a8676..db16b95 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_16_Swisscom.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_16_Swisscom.xml
@@ -2,7 +2,6 @@
 <carrier_config>
     <int name="qns.mms_rat_preference_int" value="3"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
     <int-array name="qns.ims_wwan_hysteresis_timer_ms_int_array" num="3">
         <item value="120000"/>
         <item value="120000"/>
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_1707_Starhub-SG.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_1707_Starhub-SG.xml
index ace1ca1..fed6d17 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_1707_Starhub-SG.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_1707_Starhub-SG.xml
@@ -2,5 +2,4 @@
 <carrier_config>
     <int name="qns.sos_transport_type_int" value="2"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
 </carrier_config>
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_1884_CHT-TW.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_1884_CHT-TW.xml
index 5228b76..fdd0dcd 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_1884_CHT-TW.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_1884_CHT-TW.xml
@@ -3,5 +3,4 @@
     <int name="qns.sos_transport_type_int" value="2"/>
     <int name="qns.mms_rat_preference_int" value="3"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
 </carrier_config>
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_1895_Freedommobile-CA.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_1895_Freedommobile-CA.xml
index f28ea0b..9cced41 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_1895_Freedommobile-CA.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_1895_Freedommobile-CA.xml
@@ -4,5 +4,4 @@
     <int name="qns.xcap_rat_preference_int" value="2"/>
     <int name="qns.mms_rat_preference_int" value="2"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
 </carrier_config>
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_1900_OneCall-NO.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_1900_OneCall-NO.xml
index be72261..cc4c410 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_1900_OneCall-NO.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_1900_OneCall-NO.xml
@@ -2,5 +2,4 @@
 <carrier_config>
     <int name="qns.mms_rat_preference_int" value="3"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
 </carrier_config>
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_1903_H3-IE.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_1903_H3-IE.xml
index be72261..cc4c410 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_1903_H3-IE.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_1903_H3-IE.xml
@@ -2,5 +2,4 @@
 <carrier_config>
     <int name="qns.mms_rat_preference_int" value="3"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
 </carrier_config>
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_1961_Airtel.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_1961_Airtel.xml
index 87c7bb6..84f8a30 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_1961_Airtel.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_1961_Airtel.xml
@@ -7,5 +7,4 @@
     </string-array>
     <int name="qns.mms_rat_preference_int" value="3"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
 </carrier_config>
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_1962_Fido-CA.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_1962_Fido-CA.xml
index f7e8737..0633e46 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_1962_Fido-CA.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_1962_Fido-CA.xml
@@ -14,7 +14,6 @@
     </int-array>
     <int name="qns.mms_rat_preference_int" value="2"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
     <int-array name="qns.video_wifi_rssi_int_array" num="2">
         <item value="-65"/>
         <item value="-78"/>
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_19_Vodafone-IE.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_19_Vodafone-IE.xml
index c29ea66..a6c8061 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_19_Vodafone-IE.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_19_Vodafone-IE.xml
@@ -4,5 +4,4 @@
     <boolean name="qns.block_iwlan_in_international_roaming_without_wwan_bool" value="true"/>
     <int name="qns.mms_rat_preference_int" value="3"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
 </carrier_config>
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_1_T-Mobile-US.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_1_T-Mobile-US.xml
index b05ae27..729109a 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_1_T-Mobile-US.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_1_T-Mobile-US.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <carrier_config>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
     <int-array name="qns.ims_wwan_hysteresis_timer_ms_int_array" num="3">
         <item value="10000"/>
         <item value="10000"/>
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_2008_Videtron-CA.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_2008_Videtron-CA.xml
index eddaff9..960f33f 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_2008_Videtron-CA.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_2008_Videtron-CA.xml
@@ -3,7 +3,6 @@
     <int name="qns.sos_transport_type_int" value="2"/>
     <int name="qns.mms_rat_preference_int" value="3"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
     <int-array name="qns.idle_eutran_rsrp_int_array" num="2">
         <item value="-114"/>
         <item value="-120"/>
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_2018_Reliance-Jio.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_2018_Reliance-Jio.xml
index e7f90f0..13133ef 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_2018_Reliance-Jio.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_2018_Reliance-Jio.xml
@@ -7,6 +7,5 @@
     <boolean name="qns.roam_transport_type_selection_without_signal_strength_bool" value="true" />
     <int name="qns.mms_rat_preference_int" value="3"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
     <string name="qns_wlan_rtt_backhaul_check_on_icmp_ping_string">www.google.com,5,200,32,100,600000,1800000</string>
 </carrier_config>
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_2020_Koodo-CA.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_2020_Koodo-CA.xml
index a0aed67..cb0f9ae 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_2020_Koodo-CA.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_2020_Koodo-CA.xml
@@ -9,7 +9,6 @@
     <int name="qns.xcap_rat_preference_int" value="2"/>
     <int name="qns.mms_rat_preference_int" value="2"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
     <int-array name="qns.idle_eutran_rsrp_int_array" num="2">
         <item value="-106"/>
         <item value="-116"/>
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_2021_Virgin-CA.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_2021_Virgin-CA.xml
index f28ea0b..9cced41 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_2021_Virgin-CA.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_2021_Virgin-CA.xml
@@ -4,5 +4,4 @@
     <int name="qns.xcap_rat_preference_int" value="2"/>
     <int name="qns.mms_rat_preference_int" value="2"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
 </carrier_config>
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_2090_Tbaytel_ca.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_2090_Tbaytel_ca.xml
index f7e8737..0633e46 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_2090_Tbaytel_ca.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_2090_Tbaytel_ca.xml
@@ -14,7 +14,6 @@
     </int-array>
     <int name="qns.mms_rat_preference_int" value="2"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
     <int-array name="qns.video_wifi_rssi_int_array" num="2">
         <item value="-65"/>
         <item value="-78"/>
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_2092_Congstar-DE.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_2092_Congstar-DE.xml
index c154295..b204cef 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_2092_Congstar-DE.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_2092_Congstar-DE.xml
@@ -4,7 +4,6 @@
     <int name="qns.mms_rat_preference_int" value="2"/>
     <boolean name="qns.override_cell_pref_to_ims_pref_home" value="true"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
     <string-array name="qns.ims_cellular_allowed_rat_string_array" num="1">
         <item value="LTE"/>
     </string-array>
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_20_Vodafone-NL.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_20_Vodafone-NL.xml
index 1e118f1..fcd42ec 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_20_Vodafone-NL.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_20_Vodafone-NL.xml
@@ -15,7 +15,6 @@
     <boolean name="qns.block_iwlan_in_international_roaming_without_wwan_bool" value="true"/>
     <int name="qns.mms_rat_preference_int" value="3"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
     <int-array name="qns.idle_eutran_rsrp_int_array" num="2">
         <item value="-104"/>
         <item value="-118"/>
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_2101_BTC-GB.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_2101_BTC-GB.xml
index 8fe424c..a32a97c 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_2101_BTC-GB.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_2101_BTC-GB.xml
@@ -3,5 +3,4 @@
     <int name="qns.sos_transport_type_int" value="2"/>
     <int name="qns.mms_rat_preference_int" value="2"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
 </carrier_config>
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_2102_BTB-GB.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_2102_BTB-GB.xml
index 8fe424c..a32a97c 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_2102_BTB-GB.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_2102_BTB-GB.xml
@@ -3,5 +3,4 @@
     <int name="qns.sos_transport_type_int" value="2"/>
     <int name="qns.mms_rat_preference_int" value="2"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
 </carrier_config>
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_2282_Kena-IT.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_2282_Kena-IT.xml
index be72261..cc4c410 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_2282_Kena-IT.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_2282_Kena-IT.xml
@@ -2,5 +2,4 @@
 <carrier_config>
     <int name="qns.mms_rat_preference_int" value="3"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
 </carrier_config>
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_2287_Halebop-SE.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_2287_Halebop-SE.xml
index be72261..cc4c410 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_2287_Halebop-SE.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_2287_Halebop-SE.xml
@@ -2,5 +2,4 @@
 <carrier_config>
     <int name="qns.mms_rat_preference_int" value="3"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
 </carrier_config>
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_2366_Swisscom.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_2366_Swisscom.xml
index 18a8676..db16b95 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_2366_Swisscom.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_2366_Swisscom.xml
@@ -2,7 +2,6 @@
 <carrier_config>
     <int name="qns.mms_rat_preference_int" value="3"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
     <int-array name="qns.ims_wwan_hysteresis_timer_ms_int_array" num="3">
         <item value="120000"/>
         <item value="120000"/>
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_2386_Tmobile-NL.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_2386_Tmobile-NL.xml
index 120de5d..f870823 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_2386_Tmobile-NL.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_2386_Tmobile-NL.xml
@@ -26,7 +26,6 @@
     <int name="qns.xcap_rat_preference_int" value="2"/>
     <int name="qns.mms_rat_preference_int" value="2"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
     <int-array name="qns.idle_utran_rscp_int_array" num="2">
         <item value="-99"/>
         <item value="-103"/>
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_2398_Vodafone-CZ.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_2398_Vodafone-CZ.xml
index 2e6a703..073866a 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_2398_Vodafone-CZ.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_2398_Vodafone-CZ.xml
@@ -3,5 +3,4 @@
     <boolean name="qns.block_iwlan_in_international_roaming_without_wwan_bool" value="true"/>
     <int name="qns.mms_rat_preference_int" value="3"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
 </carrier_config>
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_2417_Fizz-CA.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_2417_Fizz-CA.xml
index eddaff9..960f33f 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_2417_Fizz-CA.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_2417_Fizz-CA.xml
@@ -3,7 +3,6 @@
     <int name="qns.sos_transport_type_int" value="2"/>
     <int name="qns.mms_rat_preference_int" value="3"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
     <int-array name="qns.idle_eutran_rsrp_int_array" num="2">
         <item value="-114"/>
         <item value="-120"/>
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_2418_Talkmobile-GB.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_2418_Talkmobile-GB.xml
index be72261..cc4c410 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_2418_Talkmobile-GB.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_2418_Talkmobile-GB.xml
@@ -2,5 +2,4 @@
 <carrier_config>
     <int name="qns.mms_rat_preference_int" value="3"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
 </carrier_config>
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_2455_Homobile_IT.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_2455_Homobile_IT.xml
index be72261..cc4c410 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_2455_Homobile_IT.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_2455_Homobile_IT.xml
@@ -2,5 +2,4 @@
 <carrier_config>
     <int name="qns.mms_rat_preference_int" value="3"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
 </carrier_config>
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_2460_Shaw-CA.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_2460_Shaw-CA.xml
index f28ea0b..9cced41 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_2460_Shaw-CA.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_2460_Shaw-CA.xml
@@ -4,5 +4,4 @@
     <int name="qns.xcap_rat_preference_int" value="2"/>
     <int name="qns.mms_rat_preference_int" value="2"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
 </carrier_config>
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_2467_ESN-GB.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_2467_ESN-GB.xml
index e8d8717..2ed7d8e 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_2467_ESN-GB.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_2467_ESN-GB.xml
@@ -4,5 +4,4 @@
     <int name="qns.xcap_rat_preference_int" value="2"/>
     <int name="qns.sos_transport_type_int" value="2"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
 </carrier_config>
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_26_Vodafone-ES.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_26_Vodafone-ES.xml
index f8792f6..431b491 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_26_Vodafone-ES.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_26_Vodafone-ES.xml
@@ -2,6 +2,5 @@
 <carrier_config>
     <int name="qns.mms_rat_preference_int" value="3"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
     <boolean name="qns.block_iwlan_in_international_roaming_without_wwan_bool" value="true"/>
 </carrier_config>
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_28_Vodafone-GB.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_28_Vodafone-GB.xml
index fdcbafa..8a2010e 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_28_Vodafone-GB.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_28_Vodafone-GB.xml
@@ -13,7 +13,6 @@
     </int-array>
     <int name="qns.mms_rat_preference_int" value="3"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
     <int-array name="qns.idle_eutran_rsrp_int_array" num="2">
         <item value="-110"/>
         <item value="-116"/>
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_29_Vodafone-IT.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_29_Vodafone-IT.xml
index f8792f6..431b491 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_29_Vodafone-IT.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_29_Vodafone-IT.xml
@@ -2,6 +2,5 @@
 <carrier_config>
     <int name="qns.mms_rat_preference_int" value="3"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
     <boolean name="qns.block_iwlan_in_international_roaming_without_wwan_bool" value="true"/>
 </carrier_config>
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_2_EE-GB.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_2_EE-GB.xml
index e8d8717..2ed7d8e 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_2_EE-GB.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_2_EE-GB.xml
@@ -4,5 +4,4 @@
     <int name="qns.xcap_rat_preference_int" value="2"/>
     <int name="qns.sos_transport_type_int" value="2"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
 </carrier_config>
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_30_Optus-AU.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_30_Optus-AU.xml
index 0aaa616..86e5286 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_30_Optus-AU.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_30_Optus-AU.xml
@@ -2,7 +2,6 @@
 <carrier_config>
     <int name="qns.mms_rat_preference_int" value="2"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
     <int-array name="qns.idle_eutran_rsrp_int_array" num="2">
         <item value="-104"/>
         <item value="-113"/>
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_31_Singtel-SG.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_31_Singtel-SG.xml
index 5228b76..fdd0dcd 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_31_Singtel-SG.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_31_Singtel-SG.xml
@@ -3,5 +3,4 @@
     <int name="qns.sos_transport_type_int" value="2"/>
     <int name="qns.mms_rat_preference_int" value="3"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
 </carrier_config>
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_32_Orange-FR.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_32_Orange-FR.xml
index 2d39474..808f614 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_32_Orange-FR.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_32_Orange-FR.xml
@@ -2,7 +2,6 @@
 <carrier_config>
     <int name="qns.mms_rat_preference_int" value="2"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
     <int-array name="qns.idle_wifi_rssi_int_array" num="2">
         <item value="-65"/>
         <item value="-75"/>
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_33_Tim-IT.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_33_Tim-IT.xml
index be72261..cc4c410 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_33_Tim-IT.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_33_Tim-IT.xml
@@ -2,5 +2,4 @@
 <carrier_config>
     <int name="qns.mms_rat_preference_int" value="3"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
 </carrier_config>
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_3_Telekom.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_3_Telekom.xml
index c154295..b204cef 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_3_Telekom.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_3_Telekom.xml
@@ -4,7 +4,6 @@
     <int name="qns.mms_rat_preference_int" value="2"/>
     <boolean name="qns.override_cell_pref_to_ims_pref_home" value="true"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
     <string-array name="qns.ims_cellular_allowed_rat_string_array" num="1">
         <item value="LTE"/>
     </string-array>
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_4_Tmobile-AT.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_4_Tmobile-AT.xml
index be72261..cc4c410 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_4_Tmobile-AT.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_4_Tmobile-AT.xml
@@ -2,5 +2,4 @@
 <carrier_config>
     <int name="qns.mms_rat_preference_int" value="3"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
 </carrier_config>
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_576_Bell-CA.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_576_Bell-CA.xml
index f28ea0b..9cced41 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_576_Bell-CA.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_576_Bell-CA.xml
@@ -4,5 +4,4 @@
     <int name="qns.xcap_rat_preference_int" value="2"/>
     <int name="qns.mms_rat_preference_int" value="2"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
 </carrier_config>
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_656_Telia-DK.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_656_Telia-DK.xml
index b1e7d2a..be4c547 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_656_Telia-DK.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_656_Telia-DK.xml
@@ -3,5 +3,4 @@
     <int name="qns.xcap_rat_preference_int" value="2"/>
     <int name="qns.mms_rat_preference_int" value="3"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
 </carrier_config>
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_792_H3G-IE.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_792_H3G-IE.xml
index be72261..cc4c410 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_792_H3G-IE.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_792_H3G-IE.xml
@@ -2,5 +2,4 @@
 <carrier_config>
     <int name="qns.mms_rat_preference_int" value="3"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
 </carrier_config>
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_958_Telenor-NO.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_958_Telenor-NO.xml
index be72261..cc4c410 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_958_Telenor-NO.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_958_Telenor-NO.xml
@@ -2,5 +2,4 @@
 <carrier_config>
     <int name="qns.mms_rat_preference_int" value="3"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
 </carrier_config>
diff --git a/services/QualifiedNetworksService/assets/carrier_config_carrierid_959_Telia-NO.xml b/services/QualifiedNetworksService/assets/carrier_config_carrierid_959_Telia-NO.xml
index be72261..cc4c410 100644
--- a/services/QualifiedNetworksService/assets/carrier_config_carrierid_959_Telia-NO.xml
+++ b/services/QualifiedNetworksService/assets/carrier_config_carrierid_959_Telia-NO.xml
@@ -2,5 +2,4 @@
 <carrier_config>
     <int name="qns.mms_rat_preference_int" value="3"/>
     <int name="qns.mms_transport_type_int" value="2"/>
-    <int name="qns.xcap_transport_type_int" value="2"/>
 </carrier_config>
diff --git a/services/QualifiedNetworksService/src/com/android/telephony/qns/AccessNetworkEvaluator.java b/services/QualifiedNetworksService/src/com/android/telephony/qns/AccessNetworkEvaluator.java
index 1ef7f6e..ea54435 100644
--- a/services/QualifiedNetworksService/src/com/android/telephony/qns/AccessNetworkEvaluator.java
+++ b/services/QualifiedNetworksService/src/com/android/telephony/qns/AccessNetworkEvaluator.java
@@ -958,11 +958,10 @@ class AccessNetworkEvaluator {
 
     private boolean isAccessNetworkAllowed(int accessNetwork, int netCapability) {
         switch (netCapability) {
+            case NetworkCapabilities.NET_CAPABILITY_EIMS:
             case NetworkCapabilities.NET_CAPABILITY_IMS:
+            case NetworkCapabilities.NET_CAPABILITY_XCAP:
                 return mConfigManager.isAccessNetworkAllowed(accessNetwork, netCapability);
-            case NetworkCapabilities.NET_CAPABILITY_EIMS:
-                return mConfigManager.isAccessNetworkAllowed(
-                        accessNetwork, NetworkCapabilities.NET_CAPABILITY_IMS);
             default:
                 if (accessNetwork == AccessNetworkType.UNKNOWN) {
                     return false;
diff --git a/services/QualifiedNetworksService/src/com/android/telephony/qns/QnsCarrierConfigManager.java b/services/QualifiedNetworksService/src/com/android/telephony/qns/QnsCarrierConfigManager.java
index ec6281a..1f869d1 100644
--- a/services/QualifiedNetworksService/src/com/android/telephony/qns/QnsCarrierConfigManager.java
+++ b/services/QualifiedNetworksService/src/com/android/telephony/qns/QnsCarrierConfigManager.java
@@ -62,6 +62,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Set;
@@ -378,25 +379,6 @@ class QnsCarrierConfigManager {
     static final String KEY_QNS_MMS_TRANSPORT_TYPE_INT = "qns.mms_transport_type_int";
 
     /**
-     * Specifies the Transport type UE supports with QNS services for XCAP network capability.
-     * {@link QnsConstants}. The values are set as below:
-     *
-     * <ul>
-     *   <li>0: {@link QnsConstants#TRANSPORT_TYPE_ALLOWED_WWAN}
-     *   <li>1: {@link QnsConstants#TRANSPORT_TYPE_ALLOWED_IWLAN}
-     *   <li>2: {@link QnsConstants#TRANSPORT_TYPE_ALLOWED_BOTH}
-     * </ul>
-     *
-     * <p>{@code QnsConstants#TRANSPORT_TYPE_ALLOWED_WWAN}: If set , Transport type UE supports is
-     * cellular for XCAP network capability. {@code QnsConstants#TRANSPORT_TYPE_ALLOWED_IWLAN}: If
-     * this value set , Transport type UE supports is Wifi for XCAP network capability. {@code
-     * QnsConstants#TRANSPORT_TYPE_ALLOWED_BOTH}: If this value set , Transport type UE supports is
-     * both Cellular & Wifi for XCAP network capability. The default value for this key is {@link
-     * QnsConstants#TRANSPORT_TYPE_ALLOWED_WWAN}
-     */
-    static final String KEY_QNS_XCAP_TRANSPORT_TYPE_INT = "qns.xcap_transport_type_int";
-
-    /**
      * Specifies the Transport type UE supports with QNS services for CBS network capability. {@link
      * QnsConstants}. The values are set as below:
      *
@@ -747,7 +729,7 @@ class QnsCarrierConfigManager {
     private int mQnsImsTransportType;
     private int mQnsSosTransportType;
     private int mQnsMmsTransportType;
-    private int mQnsXcapTransportType;
+    private int[] mQnsXcapSupportedAccessNetworkTypes;
     private int mQnsCbsTransportType;
     private int mXcapRatPreference;
     private int mSosRatPreference;
@@ -1334,8 +1316,11 @@ class QnsCarrierConfigManager {
                 getConfig(bundleCarrier, bundleAsset, KEY_QNS_SOS_TRANSPORT_TYPE_INT);
         mQnsMmsTransportType =
                 getConfig(bundleCarrier, bundleAsset, KEY_QNS_MMS_TRANSPORT_TYPE_INT);
-        mQnsXcapTransportType =
-                getConfig(bundleCarrier, bundleAsset, KEY_QNS_XCAP_TRANSPORT_TYPE_INT);
+        mQnsXcapSupportedAccessNetworkTypes =
+                getConfig(
+                        bundleCarrier,
+                        bundleAsset,
+                        CarrierConfigManager.ImsSs.KEY_XCAP_OVER_UT_SUPPORTED_RATS_INT_ARRAY);
         mQnsCbsTransportType =
                 getConfig(bundleCarrier, bundleAsset, KEY_QNS_CBS_TRANSPORT_TYPE_INT);
         mQnsCbsTransportType =
@@ -1964,7 +1949,19 @@ class QnsCarrierConfigManager {
         } else if (netCapability == NetworkCapabilities.NET_CAPABILITY_MMS) {
             return mQnsMmsTransportType;
         } else if (netCapability == NetworkCapabilities.NET_CAPABILITY_XCAP) {
-            return mQnsXcapTransportType;
+            HashSet<Integer> supportedTransportType = new HashSet<>();
+            if (mQnsXcapSupportedAccessNetworkTypes != null) {
+                Arrays.stream(mQnsXcapSupportedAccessNetworkTypes)
+                        .forEach(accessNetwork -> supportedTransportType.add(
+                                QnsUtils.getTransportTypeFromAccessNetwork(accessNetwork)));
+            }
+            if (supportedTransportType.contains(AccessNetworkConstants.TRANSPORT_TYPE_WLAN)) {
+                if (supportedTransportType.contains(AccessNetworkConstants.TRANSPORT_TYPE_WWAN)) {
+                    return QnsConstants.TRANSPORT_TYPE_ALLOWED_BOTH;
+                }
+                return QnsConstants.TRANSPORT_TYPE_ALLOWED_IWLAN;
+            }
+            return QnsConstants.TRANSPORT_TYPE_ALLOWED_WWAN;
         } else if (netCapability == NetworkCapabilities.NET_CAPABILITY_CBS) {
             return mQnsCbsTransportType;
         }
@@ -2382,8 +2379,10 @@ class QnsCarrierConfigManager {
                 || mQnsMmsTransportType == QnsConstants.TRANSPORT_TYPE_ALLOWED_BOTH) {
             netCapabilities.add(NetworkCapabilities.NET_CAPABILITY_MMS);
         }
-        if (mQnsXcapTransportType == QnsConstants.TRANSPORT_TYPE_ALLOWED_IWLAN
-                || mQnsXcapTransportType == QnsConstants.TRANSPORT_TYPE_ALLOWED_BOTH) {
+        if (mQnsXcapSupportedAccessNetworkTypes != null
+                && Arrays.stream(mQnsXcapSupportedAccessNetworkTypes)
+                        .anyMatch(accessNetwork -> QnsUtils.getTransportTypeFromAccessNetwork(
+                                accessNetwork) == AccessNetworkConstants.TRANSPORT_TYPE_WLAN)) {
             netCapabilities.add(NetworkCapabilities.NET_CAPABILITY_XCAP);
         }
         if (mQnsCbsTransportType == QnsConstants.TRANSPORT_TYPE_ALLOWED_IWLAN
@@ -2393,34 +2392,42 @@ class QnsCarrierConfigManager {
         return netCapabilities;
     }
 
+    private static HashMap<Integer, String> sRatStringMatcher;
+    static {
+        sRatStringMatcher = new HashMap<>();
+        sRatStringMatcher.put(AccessNetworkConstants.AccessNetworkType.EUTRAN, "LTE");
+        sRatStringMatcher.put(AccessNetworkConstants.AccessNetworkType.NGRAN, "NR");
+        sRatStringMatcher.put(AccessNetworkConstants.AccessNetworkType.UTRAN, "3G");
+        sRatStringMatcher.put(AccessNetworkConstants.AccessNetworkType.GERAN, "2G");
+    }
+
     /**
      * This method returns Allowed cellular RAT for IMS
      *
-     * @param accessNetwork , netCapability : EUTRAN / NGRAN / UTRAN/ GERAN
+     * @param accessNetwork : (EUTRAN, NGRAN, UTRAN, GERAN)
+     * @param netCapability : (ims, sos, mms, xcap, cbs)
      * @return : True or False based on configuration
      */
     boolean isAccessNetworkAllowed(int accessNetwork, int netCapability) {
 
-        // cases to be enhanced for different key items when added
-        if (netCapability == NetworkCapabilities.NET_CAPABILITY_IMS) {
-            if (mImsAllowedRats != null) {
-                for (String cellularRatType : mImsAllowedRats) {
-                    if ((cellularRatType.contains("LTE")
-                                    && accessNetwork
-                                            == AccessNetworkConstants.AccessNetworkType.EUTRAN)
-                            || (cellularRatType.contains("NR")
-                                    && accessNetwork
-                                            == AccessNetworkConstants.AccessNetworkType.NGRAN)
-                            || (cellularRatType.contains("3G")
-                                    && accessNetwork
-                                            == AccessNetworkConstants.AccessNetworkType.UTRAN)
-                            || (cellularRatType.contains("2G")
-                                    && accessNetwork
-                                            == AccessNetworkConstants.AccessNetworkType.GERAN)) {
-                        return true;
-                    }
+        switch (netCapability) {
+            case NetworkCapabilities.NET_CAPABILITY_EIMS:
+            case NetworkCapabilities.NET_CAPABILITY_IMS:
+                // cases to be enhanced for different key items when added
+                String ratName = sRatStringMatcher.get(accessNetwork);
+                if (mImsAllowedRats != null
+                        && ratName != null
+                        && Arrays.stream(mImsAllowedRats)
+                                .anyMatch(ratType -> TextUtils.equals(ratType, ratName))) {
+                    return true;
                 }
-            }
+                break;
+            case NetworkCapabilities.NET_CAPABILITY_XCAP:
+                return mQnsXcapSupportedAccessNetworkTypes != null
+                        && Arrays.stream(mQnsXcapSupportedAccessNetworkTypes)
+                                .anyMatch(xcapAccessNetwork -> accessNetwork == xcapAccessNetwork);
+            default:
+                return false;
         }
         return false;
     }
diff --git a/services/QualifiedNetworksService/src/com/android/telephony/qns/QnsUtils.java b/services/QualifiedNetworksService/src/com/android/telephony/qns/QnsUtils.java
index c17a2c7..85ae192 100644
--- a/services/QualifiedNetworksService/src/com/android/telephony/qns/QnsUtils.java
+++ b/services/QualifiedNetworksService/src/com/android/telephony/qns/QnsUtils.java
@@ -625,7 +625,6 @@ class QnsUtils {
             case QnsCarrierConfigManager.KEY_QNS_IMS_TRANSPORT_TYPE_INT:
                 return (T) Integer.valueOf(QnsConstants.TRANSPORT_TYPE_ALLOWED_BOTH);
             case QnsCarrierConfigManager.KEY_QNS_MMS_TRANSPORT_TYPE_INT:
-            case QnsCarrierConfigManager.KEY_QNS_XCAP_TRANSPORT_TYPE_INT:
             case QnsCarrierConfigManager.KEY_QNS_CBS_TRANSPORT_TYPE_INT:
             case QnsCarrierConfigManager.KEY_QNS_SOS_TRANSPORT_TYPE_INT:
                 return (T) Integer.valueOf(QnsConstants.TRANSPORT_TYPE_ALLOWED_WWAN);
diff --git a/services/QualifiedNetworksService/tests/src/com/android/telephony/qns/QnsCarrierConfigManagerTest.java b/services/QualifiedNetworksService/tests/src/com/android/telephony/qns/QnsCarrierConfigManagerTest.java
index 3e2a7e5..fb3bd67 100644
--- a/services/QualifiedNetworksService/tests/src/com/android/telephony/qns/QnsCarrierConfigManagerTest.java
+++ b/services/QualifiedNetworksService/tests/src/com/android/telephony/qns/QnsCarrierConfigManagerTest.java
@@ -162,13 +162,13 @@ public class QnsCarrierConfigManagerTest extends QnsTest {
                 mConfigManager.isAccessNetworkAllowed(
                         AccessNetworkConstants.AccessNetworkType.EUTRAN,
                         NetworkCapabilities.NET_CAPABILITY_EIMS);
-        Assert.assertFalse(isAccessNetworkAllowedForRat);
+        Assert.assertTrue(isAccessNetworkAllowedForRat);
 
         isAccessNetworkAllowedForRat =
                 mConfigManager.isAccessNetworkAllowed(
                         AccessNetworkConstants.AccessNetworkType.NGRAN,
                         NetworkCapabilities.NET_CAPABILITY_EIMS);
-        Assert.assertFalse(isAccessNetworkAllowedForRat);
+        Assert.assertTrue(isAccessNetworkAllowedForRat);
 
         isAccessNetworkAllowedForRat =
                 mConfigManager.isAccessNetworkAllowed(
@@ -475,31 +475,48 @@ public class QnsCarrierConfigManagerTest extends QnsTest {
 
     @Test
     public void testGetQnsSupportedNetCapabilitiesWithTestBundle() {
-        PersistableBundle bundle = new PersistableBundle();
-        bundle.putInt(
+        PersistableBundle bundleCarrierConfig = new PersistableBundle();
+        PersistableBundle bundleAsset = new PersistableBundle();
+        bundleAsset.putInt(
                 QnsCarrierConfigManager.KEY_QNS_SOS_TRANSPORT_TYPE_INT,
                 QnsConstants.TRANSPORT_TYPE_ALLOWED_IWLAN);
-        mConfigManager.loadQnsAneSupportConfigurations(bundle, null);
+        mConfigManager.loadQnsAneSupportConfigurations(bundleAsset, null);
         List<Integer> supportedNetCapabilities = new ArrayList<>();
         supportedNetCapabilities.add(NetworkCapabilities.NET_CAPABILITY_IMS);
         supportedNetCapabilities.add(NetworkCapabilities.NET_CAPABILITY_EIMS);
         Assert.assertEquals(
                 supportedNetCapabilities, mConfigManager.getQnsSupportedNetCapabilities());
-        bundle.putInt(
+        bundleAsset.putInt(
                 QnsCarrierConfigManager.KEY_QNS_MMS_TRANSPORT_TYPE_INT,
                 QnsConstants.TRANSPORT_TYPE_ALLOWED_IWLAN);
-        bundle.putInt(
-                QnsCarrierConfigManager.KEY_QNS_XCAP_TRANSPORT_TYPE_INT,
-                QnsConstants.TRANSPORT_TYPE_ALLOWED_BOTH);
-        bundle.putInt(
+        bundleCarrierConfig.putIntArray(
+                CarrierConfigManager.ImsSs.KEY_XCAP_OVER_UT_SUPPORTED_RATS_INT_ARRAY,
+                new int[] {AccessNetworkConstants.AccessNetworkType.EUTRAN,
+                        AccessNetworkConstants.AccessNetworkType.NGRAN,
+                        AccessNetworkConstants.AccessNetworkType.IWLAN});
+        bundleAsset.putInt(
                 QnsCarrierConfigManager.KEY_QNS_CBS_TRANSPORT_TYPE_INT,
                 QnsConstants.TRANSPORT_TYPE_ALLOWED_IWLAN);
-        mConfigManager.loadQnsAneSupportConfigurations(bundle, null);
+        mConfigManager.loadQnsAneSupportConfigurations(bundleCarrierConfig, bundleAsset);
         supportedNetCapabilities.add(NetworkCapabilities.NET_CAPABILITY_MMS);
         supportedNetCapabilities.add(NetworkCapabilities.NET_CAPABILITY_XCAP);
         supportedNetCapabilities.add(NetworkCapabilities.NET_CAPABILITY_CBS);
         Assert.assertEquals(
                 supportedNetCapabilities, mConfigManager.getQnsSupportedNetCapabilities());
+
+        bundleCarrierConfig.clear();
+        bundleCarrierConfig.putIntArray(
+                CarrierConfigManager.ImsSs.KEY_XCAP_OVER_UT_SUPPORTED_RATS_INT_ARRAY,
+                new int[] {AccessNetworkConstants.AccessNetworkType.EUTRAN,
+                        AccessNetworkConstants.AccessNetworkType.NGRAN});
+        mConfigManager.loadQnsAneSupportConfigurations(bundleCarrierConfig, bundleAsset);
+        supportedNetCapabilities.clear();
+        supportedNetCapabilities.add(NetworkCapabilities.NET_CAPABILITY_IMS);
+        supportedNetCapabilities.add(NetworkCapabilities.NET_CAPABILITY_EIMS);
+        supportedNetCapabilities.add(NetworkCapabilities.NET_CAPABILITY_MMS);
+        supportedNetCapabilities.add(NetworkCapabilities.NET_CAPABILITY_CBS);
+        Assert.assertEquals(
+                supportedNetCapabilities, mConfigManager.getQnsSupportedNetCapabilities());
     }
 
     @Test
diff --git a/services/QualifiedNetworksService/tests/src/com/android/telephony/qns/QnsUtilsTest.java b/services/QualifiedNetworksService/tests/src/com/android/telephony/qns/QnsUtilsTest.java
index 36b7a4b..7b1db18 100644
--- a/services/QualifiedNetworksService/tests/src/com/android/telephony/qns/QnsUtilsTest.java
+++ b/services/QualifiedNetworksService/tests/src/com/android/telephony/qns/QnsUtilsTest.java
@@ -362,13 +362,14 @@ public class QnsUtilsTest extends QnsTest {
                                 mTestBundle,
                                 null,
                                 QnsCarrierConfigManager.KEY_QNS_MMS_TRANSPORT_TYPE_INT));
-        assertEquals(
-                1,
-                (int)
-                        QnsUtils.getConfig(
-                                mTestBundle,
-                                null,
-                                QnsCarrierConfigManager.KEY_QNS_XCAP_TRANSPORT_TYPE_INT));
+        assertArrayEquals(
+                new int[] {
+                        AccessNetworkConstants.AccessNetworkType.IWLAN,
+                },
+                QnsUtils.getConfig(
+                        mTestBundle,
+                        null,
+                        CarrierConfigManager.ImsSs.KEY_XCAP_OVER_UT_SUPPORTED_RATS_INT_ARRAY));
         assertEquals(
                 1,
                 (int)
@@ -584,7 +585,11 @@ public class QnsUtilsTest extends QnsTest {
                 QnsCarrierConfigManager.KEY_QNS_WIFI_RSSI_THRESHOLDBACKHAUL_TIMER_MS_INT, 1);
         mTestBundle.putInt(QnsCarrierConfigManager.KEY_QNS_IMS_TRANSPORT_TYPE_INT, 1);
         mTestBundle.putInt(QnsCarrierConfigManager.KEY_QNS_MMS_TRANSPORT_TYPE_INT, 1);
-        mTestBundle.putInt(QnsCarrierConfigManager.KEY_QNS_XCAP_TRANSPORT_TYPE_INT, 1);
+        mTestBundle.putIntArray(
+                CarrierConfigManager.ImsSs.KEY_XCAP_OVER_UT_SUPPORTED_RATS_INT_ARRAY,
+                new int[] {
+                        AccessNetworkConstants.AccessNetworkType.IWLAN,
+                });
         mTestBundle.putInt(QnsCarrierConfigManager.KEY_QNS_CBS_TRANSPORT_TYPE_INT, 1);
         mTestBundle.putInt(QnsCarrierConfigManager.KEY_QNS_SOS_TRANSPORT_TYPE_INT, 1);
         mTestBundle.putInt(QnsCarrierConfigManager.KEY_QNS_MMS_RAT_PREFERENCE_INT, 1);
@@ -767,13 +772,6 @@ public class QnsUtilsTest extends QnsTest {
                         QnsUtils.getConfig(
                                 null,
                                 null,
-                                QnsCarrierConfigManager.KEY_QNS_XCAP_TRANSPORT_TYPE_INT));
-        assertEquals(
-                QnsConstants.TRANSPORT_TYPE_ALLOWED_WWAN,
-                (int)
-                        QnsUtils.getConfig(
-                                null,
-                                null,
                                 QnsCarrierConfigManager.KEY_QNS_CBS_TRANSPORT_TYPE_INT));
         assertEquals(
                 QnsConstants.TRANSPORT_TYPE_ALLOWED_WWAN,