Snap for 10453563 from 532322d0da1bec9977220039d35b2e82c4211ffb to mainline-conscrypt-releaseaml_con_341614000aml_con_341511080aml_con_341410300aml_con_341310090aml_con_341110000android14-mainline-conscrypt-release

Change-Id: I06a11063fc2bb4f569185f3c2d27256ed8df0da9

47 files changed, 206 insertions, 98 deletions

diff --git a/assets/carrier_config_carrierid_10008_Tracfone-VZW.xml b/assets/carrier_config_carrierid_10008_Tracfone-VZW.xml
index a77e7f0..ad22e76 100644
--- a/assets/carrier_config_carrierid_10008_Tracfone-VZW.xml
+++ b/assets/carrier_config_carrierid_10008_Tracfone-VZW.xml
@@ -7,4 +7,5 @@
         <item value="55BB3B316919620008AA76A4891E90384BFF2A76AE95C395FE738C2AC609F13F"/>
     </string-array>
     <boolean name="inflate_signal_strength_bool" value="true" />
+    <boolean name="enabledTransID" value="true"/>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_1010_Telekom-Romania.xml b/assets/carrier_config_carrierid_1010_Telekom-Romania.xml
index 35225ba..32bc604 100644
--- a/assets/carrier_config_carrierid_1010_Telekom-Romania.xml
+++ b/assets/carrier_config_carrierid_1010_Telekom-Romania.xml
@@ -2,9 +2,11 @@
 <carrier_config>
     <boolean name="display_hd_audio_property_bool" value="false"/>
     <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-    <string-array name="carrier_certificate_string_array" num="3">
+    <string-array name="carrier_certificate_string_array" num="5">
         <item value="191A9C9711282CCD1133C9F9EFA7D1077BCAAFB99E379A438207EE0D86218917:de.telekom.tsc"/>
         <item value="EE403A97B076CDEA7A8E8E9BC8011C0A45CEC08905F400EBECE62C946614977D:de.telekom.appstarter"/>
         <item value="D0284ECDB391CF7AC3FE44A0966C149148FF77A8E33AC6C3260FEB43E29C3EEE:ro.telekom.myaccount"/>
+        <item value="D2CB8644879FEC7DD2556673ADAF8F68899A4F2A93EEE14AD9482247B16AD02F:de.telekom.smartcredentials.entitlements"/>
+        <item value="FFEE87CCC88845E8918C7271318A9B3A9F4222F8D71F1D84D1B0C88789147F03:de.telekom.tsc,de.telekom.appstarter,de.telekom.smartcredentials.entitlements"/>
     </string-array>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_1187_AT&T.xml b/assets/carrier_config_carrierid_1187_AT&T.xml
index 691811a..11b8733 100644
--- a/assets/carrier_config_carrierid_1187_AT&T.xml
+++ b/assets/carrier_config_carrierid_1187_AT&T.xml
@@ -22,11 +22,6 @@
     <int name="ims_dtmf_tone_delay_int" value="120"/>
     <int name="default_mtu_int" value="1430"/>
     <string name="carrier_name_string">AT&amp;T</string>
-    <string-array name="carrier_data_call_retry_config_strings" num="3">
-        <item value="default:default_randomization=2000,10000,18000:5000,720000:5000,2160000:5000"/>
-        <item value="mms:default_randomization=2000,10000,18000:5000,720000:5000,2160000:5000"/>
-        <item value="others:max_retries=3,5000,5000,5000"/>
-    </string-array>
     <string-array name="non_roaming_operator_string_array" num="7">
         <item value="310"/>
         <item value="311"/>
@@ -46,9 +41,6 @@
     <int-array name="radio_restart_failure_causes_int_array" num="1">
         <item value="36"/>
     </int-array>
-    <string-array name="carrier_wlan_disallowed_apn_types_string_array" num="1">
-        <item value="default"/>
-    </string-array>
     <string-array name="ims_reasoninfo_mapping_string_array" num="2">
         <item value="352|emergency calls over wifi not allowed in this location|1622"/>
         <item value="332|service not allowed in this location|1623"/>
@@ -81,4 +73,5 @@
     <boolean name="inflate_signal_strength_bool" value="true" />
     <string name="5g_icon_configuration_string">connected_mmwave:5G_Plus,connected:5G,not_restricted_rrc_idle:5G,not_restricted_rrc_con:5G</string>
     <int name="nr_advanced_threshold_bandwidth_khz_int" value="50000" />
+    <boolean name="include_lte_for_nr_advanced_threshold_bandwidth_bool" value="true"/>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_11_Slovak-Telekom.xml b/assets/carrier_config_carrierid_11_Slovak-Telekom.xml
index 4ca5402..ada4c1d 100644
--- a/assets/carrier_config_carrierid_11_Slovak-Telekom.xml
+++ b/assets/carrier_config_carrierid_11_Slovak-Telekom.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <carrier_config>
     <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-    <string-array name="carrier_certificate_string_array" num="3">
+    <string-array name="carrier_certificate_string_array" num="5">
         <item value="191A9C9711282CCD1133C9F9EFA7D1077BCAAFB99E379A438207EE0D86218917:de.telekom.tsc"/>
         <item value="EE403A97B076CDEA7A8E8E9BC8011C0A45CEC08905F400EBECE62C946614977D:de.telekom.appstarter"/>
         <item value="A277FB2118A4C504F4F4CEC1AC21FC90376C530F113C1DA2C802A88FD55BA96B:com.telekom.portal"/>
+        <item value="D2CB8644879FEC7DD2556673ADAF8F68899A4F2A93EEE14AD9482247B16AD02F:de.telekom.smartcredentials.entitlements"/>
+        <item value="FFEE87CCC88845E8918C7271318A9B3A9F4222F8D71F1D84D1B0C88789147F03:de.telekom.tsc,de.telekom.appstarter,de.telekom.smartcredentials.entitlements"/>
     </string-array>
-</carrier_config>
\ No newline at end of file
+</carrier_config>
diff --git a/assets/carrier_config_carrierid_1385_TIM.xml b/assets/carrier_config_carrierid_1385_TIM.xml
index 7296860..c831dd8 100644
--- a/assets/carrier_config_carrierid_1385_TIM.xml
+++ b/assets/carrier_config_carrierid_1385_TIM.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <carrier_config>
     <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
+    <string-array name="carrier_certificate_string_array" num="1">
+        <item value="815641A2394999AA9AD4D499BFBD23CD073024D13A8A8639F834B5166C80B8DB:br.com.timbrasil.meutim"/>
+    </string-array>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_13_Mkedonski-Telecom-AD-Skopje.xml b/assets/carrier_config_carrierid_13_Mkedonski-Telecom-AD-Skopje.xml
index a4fa749..cddc367 100644
--- a/assets/carrier_config_carrierid_13_Mkedonski-Telecom-AD-Skopje.xml
+++ b/assets/carrier_config_carrierid_13_Mkedonski-Telecom-AD-Skopje.xml
@@ -4,10 +4,12 @@
     <int name="maxImageHeight" value="1944"/>
     <int name="maxMessageSize" value="102400"/>
     <int name="maxImageWidth" value="2592"/>
-    <string-array name="carrier_certificate_string_array" num="4">
+    <string-array name="carrier_certificate_string_array" num="6">
         <item value="191A9C9711282CCD1133C9F9EFA7D1077BCAAFB99E379A438207EE0D86218917:de.telekom.tsc"/>
         <item value="EE403A97B076CDEA7A8E8E9BC8011C0A45CEC08905F400EBECE62C946614977D:de.telekom.appstarter"/>
         <item value="1C97892608B6AA80C3B4AC5D41E3B4C4D5551C0585A923B4D82F77A961F3427E:com.morescreens.mkt"/>
         <item value="6EA117F9EF012340F40CF1AC370F5E908AC30377FEECDC2D9A7161B654FFB9E6:com.telekom.telekommk"/>
+        <item value="D2CB8644879FEC7DD2556673ADAF8F68899A4F2A93EEE14AD9482247B16AD02F:de.telekom.smartcredentials.entitlements"/>
+        <item value="FFEE87CCC88845E8918C7271318A9B3A9F4222F8D71F1D84D1B0C88789147F03:de.telekom.tsc,de.telekom.appstarter,de.telekom.smartcredentials.entitlements"/>
     </string-array>
-</carrier_config>
\ No newline at end of file
+</carrier_config>
diff --git a/assets/carrier_config_carrierid_1403_Rogers.xml b/assets/carrier_config_carrierid_1403_Rogers.xml
index 3331a8e..b3798fe 100644
--- a/assets/carrier_config_carrierid_1403_Rogers.xml
+++ b/assets/carrier_config_carrierid_1403_Rogers.xml
@@ -6,6 +6,7 @@
     <boolean name="voicemail_notification_persistent_bool" value="true"/>
     <boolean name="call_forwarding_map_non_number_to_voicemail_bool" value="true"/>
     <boolean name="carrier_name_override_bool" value="true"/>
+    <boolean name="ratchet_nr_advanced_bandwidth_if_rrc_idle_bool" value="false"/>
     <int name="smsToMmsTextThreshold" value="6"/>
     <int name="recipientLimit" value="20"/>
     <int name="maxImageHeight" value="1944"/>
diff --git a/assets/carrier_config_carrierid_1420_Claro-GT.xml b/assets/carrier_config_carrierid_1420_Claro-GT.xml
index e8fde2f..ebe580f 100644
--- a/assets/carrier_config_carrierid_1420_Claro-GT.xml
+++ b/assets/carrier_config_carrierid_1420_Claro-GT.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <carrier_config>
-    <string-array name="carrier_certificate_string_array" num="1">
+    <string-array name="carrier_certificate_string_array" num="4">
       <item value="7D7226772D4F6D778FEF53A36BE15AD78D8D9D4BC4CE00C5F2E3216C19480FA0"/>
+      <item value="2333f4065b9f054363ca63d1866cc168f45d641645b31131b14e173b9c922d15:co.sitic.pp"/>
+      <item value="14d54c64599a3e9a3b766239b160de3935093e0a:co.sitic.pp"/>
+      <item value="f54cac11d5af77a5f10c21d536ad5d1c40b00d63a92cab917aa84dc714d622d8:co.sitic.pp"/>
     </string-array>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_1429_Claro-CL.xml b/assets/carrier_config_carrierid_1429_Claro-CL.xml
index e8fde2f..ebe580f 100644
--- a/assets/carrier_config_carrierid_1429_Claro-CL.xml
+++ b/assets/carrier_config_carrierid_1429_Claro-CL.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <carrier_config>
-    <string-array name="carrier_certificate_string_array" num="1">
+    <string-array name="carrier_certificate_string_array" num="4">
       <item value="7D7226772D4F6D778FEF53A36BE15AD78D8D9D4BC4CE00C5F2E3216C19480FA0"/>
+      <item value="2333f4065b9f054363ca63d1866cc168f45d641645b31131b14e173b9c922d15:co.sitic.pp"/>
+      <item value="14d54c64599a3e9a3b766239b160de3935093e0a:co.sitic.pp"/>
+      <item value="f54cac11d5af77a5f10c21d536ad5d1c40b00d63a92cab917aa84dc714d622d8:co.sitic.pp"/>
     </string-array>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_1442_Claro-CO.xml b/assets/carrier_config_carrierid_1442_Claro-CO.xml
index e8fde2f..ebe580f 100644
--- a/assets/carrier_config_carrierid_1442_Claro-CO.xml
+++ b/assets/carrier_config_carrierid_1442_Claro-CO.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <carrier_config>
-    <string-array name="carrier_certificate_string_array" num="1">
+    <string-array name="carrier_certificate_string_array" num="4">
       <item value="7D7226772D4F6D778FEF53A36BE15AD78D8D9D4BC4CE00C5F2E3216C19480FA0"/>
+      <item value="2333f4065b9f054363ca63d1866cc168f45d641645b31131b14e173b9c922d15:co.sitic.pp"/>
+      <item value="14d54c64599a3e9a3b766239b160de3935093e0a:co.sitic.pp"/>
+      <item value="f54cac11d5af77a5f10c21d536ad5d1c40b00d63a92cab917aa84dc714d622d8:co.sitic.pp"/>
     </string-array>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_1467_Claro-RD.xml b/assets/carrier_config_carrierid_1467_Claro-RD.xml
index e8fde2f..ebe580f 100644
--- a/assets/carrier_config_carrierid_1467_Claro-RD.xml
+++ b/assets/carrier_config_carrierid_1467_Claro-RD.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <carrier_config>
-    <string-array name="carrier_certificate_string_array" num="1">
+    <string-array name="carrier_certificate_string_array" num="4">
       <item value="7D7226772D4F6D778FEF53A36BE15AD78D8D9D4BC4CE00C5F2E3216C19480FA0"/>
+      <item value="2333f4065b9f054363ca63d1866cc168f45d641645b31131b14e173b9c922d15:co.sitic.pp"/>
+      <item value="14d54c64599a3e9a3b766239b160de3935093e0a:co.sitic.pp"/>
+      <item value="f54cac11d5af77a5f10c21d536ad5d1c40b00d63a92cab917aa84dc714d622d8:co.sitic.pp"/>
     </string-array>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_1473_Claro-EC.xml b/assets/carrier_config_carrierid_1473_Claro-EC.xml
index ada0291..ef1cea3 100644
--- a/assets/carrier_config_carrierid_1473_Claro-EC.xml
+++ b/assets/carrier_config_carrierid_1473_Claro-EC.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <carrier_config>
-    <string-array name="carrier_certificate_string_array" num="1">
+    <string-array name="carrier_certificate_string_array" num="4">
       <item value="7D7226772D4F6D778FEF53A36BE15AD78D8D9D4BC4CE00C5F2E3216C19480FA0"/>
+      <item value="2333f4065b9f054363ca63d1866cc168f45d641645b31131b14e173b9c922d15:co.sitic.pp"/>
+      <item value="14d54c64599a3e9a3b766239b160de3935093e0a:co.sitic.pp"/>
+      <item value="f54cac11d5af77a5f10c21d536ad5d1c40b00d63a92cab917aa84dc714d622d8:co.sitic.pp"/>
     </string-array>
 </carrier_config>
 
diff --git a/assets/carrier_config_carrierid_1520_Claro-GT.xml b/assets/carrier_config_carrierid_1520_Claro-GT.xml
index 37cec5a..ebbcbe9 100644
--- a/assets/carrier_config_carrierid_1520_Claro-GT.xml
+++ b/assets/carrier_config_carrierid_1520_Claro-GT.xml
@@ -5,4 +5,10 @@
         <item value="*5"/>
         <item value="*9"/>
     </string-array>
+    <string-array name="carrier_certificate_string_array" num="4">
+      <item value="7D7226772D4F6D778FEF53A36BE15AD78D8D9D4BC4CE00C5F2E3216C19480FA0"/>
+      <item value="2333f4065b9f054363ca63d1866cc168f45d641645b31131b14e173b9c922d15:co.sitic.pp"/>
+      <item value="14d54c64599a3e9a3b766239b160de3935093e0a:co.sitic.pp"/>
+      <item value="f54cac11d5af77a5f10c21d536ad5d1c40b00d63a92cab917aa84dc714d622d8:co.sitic.pp"/>
+    </string-array>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_1581_au.xml b/assets/carrier_config_carrierid_1581_au.xml
index 8d28121..01daff6 100644
--- a/assets/carrier_config_carrierid_1581_au.xml
+++ b/assets/carrier_config_carrierid_1581_au.xml
@@ -10,4 +10,10 @@
     <boolean name="carrier_name_override_bool" value="true"/>
     <int name="default_mtu_int" value="1420"/>
     <string name="carrier_name_string">au</string>
+    <string-array name="carrier_certificate_string_array" num="4">
+        <item value="108897103871B684844AA7C791E0C812AB3966576FB5D3713C2D11794C0600AD:com.kddi.cs.app001"/>
+        <item value="5EA3181DF228B4F8B0DECC10B21783F8C6C397F1290F2395FE3E6FDB2B52E991:jp.uqmobile.uqmobileportalapp"/>
+        <item value="891ABE3F0A0D794AD46200DC2374AFF61AFA82711C360EE0CB49C3E6BB2BA006:jp.auone.wallet"/>
+        <item value="1001568BB4A4E65F68C8B0F2E5C9EBC97FF719898F39E421DAF29A8DACEAAF1B:com.kddi.android.cmail"/>
+    </string-array>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_1641_Claro-NI.xml b/assets/carrier_config_carrierid_1641_Claro-NI.xml
index e8fde2f..ebe580f 100644
--- a/assets/carrier_config_carrierid_1641_Claro-NI.xml
+++ b/assets/carrier_config_carrierid_1641_Claro-NI.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <carrier_config>
-    <string-array name="carrier_certificate_string_array" num="1">
+    <string-array name="carrier_certificate_string_array" num="4">
       <item value="7D7226772D4F6D778FEF53A36BE15AD78D8D9D4BC4CE00C5F2E3216C19480FA0"/>
+      <item value="2333f4065b9f054363ca63d1866cc168f45d641645b31131b14e173b9c922d15:co.sitic.pp"/>
+      <item value="14d54c64599a3e9a3b766239b160de3935093e0a:co.sitic.pp"/>
+      <item value="f54cac11d5af77a5f10c21d536ad5d1c40b00d63a92cab917aa84dc714d622d8:co.sitic.pp"/>
     </string-array>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_1647_Claro-PE.xml b/assets/carrier_config_carrierid_1647_Claro-PE.xml
index e8fde2f..ebe580f 100644
--- a/assets/carrier_config_carrierid_1647_Claro-PE.xml
+++ b/assets/carrier_config_carrierid_1647_Claro-PE.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <carrier_config>
-    <string-array name="carrier_certificate_string_array" num="1">
+    <string-array name="carrier_certificate_string_array" num="4">
       <item value="7D7226772D4F6D778FEF53A36BE15AD78D8D9D4BC4CE00C5F2E3216C19480FA0"/>
+      <item value="2333f4065b9f054363ca63d1866cc168f45d641645b31131b14e173b9c922d15:co.sitic.pp"/>
+      <item value="14d54c64599a3e9a3b766239b160de3935093e0a:co.sitic.pp"/>
+      <item value="f54cac11d5af77a5f10c21d536ad5d1c40b00d63a92cab917aa84dc714d622d8:co.sitic.pp"/>
     </string-array>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_1839_Verizon-Wireless.xml b/assets/carrier_config_carrierid_1839_Verizon-Wireless.xml
index 421bc18..ce5ee5f 100644
--- a/assets/carrier_config_carrierid_1839_Verizon-Wireless.xml
+++ b/assets/carrier_config_carrierid_1839_Verizon-Wireless.xml
@@ -81,21 +81,12 @@
         <item value="*71"/>
         <item value="*72"/>
     </string-array>
-    <string-array name="carrier_data_call_permanent_failure_strings" num="14">
-        <item value="OPERATOR_BARRED"/>
-        <item value="MISSING_UNKNOWN_APN"/>
-        <item value="UNKNOWN_PDP_ADDRESS_TYPE"/>
-        <item value="USER_AUTHENTICATION"/>
-        <item value="SERVICE_OPTION_NOT_SUPPORTED"/>
-        <item value="SERVICE_OPTION_NOT_SUBSCRIBED"/>
-        <item value="NSAPI_IN_USE"/>
-        <item value="ONLY_IPV4_ALLOWED"/>
-        <item value="ONLY_IPV6_ALLOWED"/>
-        <item value="RADIO_POWER_OFF"/>
-        <item value="TETHERED_CALL_ACTIVE"/>
-        <item value="RADIO_NOT_AVAILABLE"/>
-        <item value="UNACCEPTABLE_NETWORK_PARAMETER"/>
-        <item value="SIGNAL_LOST"/>
+    <string-array name="telephony_data_setup_retry_rules_string_array" num="4">
+        <item value="capabilities=eims, retry_interval=1000, maximum_retries=20"/>
+        <!-- Defines permanent failures. Removed ACTIVATION_REJECT_GGSN and PROTOCOL_ERRORS from default. -->
+        <item value="permanent_fail_causes=8|27|28|29|32|33|35|50|51|-5|-6|65537|65538|-3|65543|65547|2252|2253|2254, retry_interval=2500"/>
+        <item value="capabilities=mms|supl|cbs, retry_interval=2000"/>
+        <item value="capabilities=internet|enterprise|dun|ims|fota, retry_interval=2500|3000|5000|10000|15000|20000|40000|60000|120000|240000|600000|1200000|1800000, maximum_retries=20"/>
     </string-array>
     <string-array name="carrier_metered_apn_types_strings" num="3">
         <item value="default"/>
@@ -176,8 +167,6 @@
     <string name="5g_icon_configuration_string">connected_mmwave:5G_Plus,connected:5G,not_restricted_rrc_idle:5G,not_restricted_rrc_con:5G</string>
     <string name="5g_icon_display_grace_period_string">connected_mmwave,any,3;not_restricted_rrc_idle,not_restricted_rrc_con,2</string>
     <string name="5g_icon_display_secondary_grace_period_string">connected_mmwave,not_restricted_rrc_idle,60</string>
-    <boolean name="unmetered_nr_nsa_mmwave_bool" value="true" />
-    <boolean name="unmetered_nr_sa_mmwave_bool" value="true" />
     <boolean name="inflate_signal_strength_bool" value="true" />
     <int-array name="additional_nr_advanced_bands_int_array" num="1">
         <item value="77"/>
@@ -196,6 +185,4 @@
     <string-array name="boosted_nrarfcns_string_array" num="1">
         <item value="200000-866666"/>
     </string-array>
-
-    <int name="carrier_data_call_retry_network_requested_max_count_int" value="20"/>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_1890_KT.xml b/assets/carrier_config_carrierid_1890_KT.xml
index afaef7a..a7ecd67 100644
--- a/assets/carrier_config_carrierid_1890_KT.xml
+++ b/assets/carrier_config_carrierid_1890_KT.xml
@@ -35,7 +35,7 @@
         <item value="NR_NSA_MMWAVE:563200,614400"/>
         <item value="NR_SA:563200,61440"/>
     </string-array>
-    <string-array name="carrier_certificate_string_array" num="9">
+    <string-array name="carrier_certificate_string_array" num="10">
         <item value="98987CACCAAF8355A4DC1FEF2600441F8B0EC923BBFAA3327D099CE4CDE29B0E"/>
         <item value="7117EE13C842F1009553C8B70FFF7CF30EC8F04118AE87B6722E2F05193EA09A"/>
         <item value="30BCC971FC0B69D54E7795B73EA2B11BF526E783850AFD2E73E1EE66DF120630"/>
@@ -45,5 +45,6 @@
         <item value="0334C8DDD8877B41912D950754D82BE8713E0573AF6D56FBB0537E1FD322A125"/>
         <item value="F5A500ED4E83B7E9BDF80E1837B4A7A1D5D2D03C6B5AE66060644E8C9BF76C87"/>
         <item value="C14BC5BC392DA316E7477D3BB4FB1AC045CDB7FA07874967143633F69373493F"/>
+        <item value="01B6241AB640C986B4C1AD572231442C5C313404A8955B28BBEBC92F4FF6901A:com.kt.ollehusimmanager"/>
     </string-array>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_1913_Telcel.xml b/assets/carrier_config_carrierid_1913_Telcel.xml
index c518481..77aaeda 100644
--- a/assets/carrier_config_carrierid_1913_Telcel.xml
+++ b/assets/carrier_config_carrierid_1913_Telcel.xml
@@ -4,25 +4,18 @@
     <int name="maxImageHeight" value="1944"/>
     <int name="maxMessageSize" value="1048576"/>
     <int name="maxImageWidth" value="2592"/>
-    <string-array name="carrier_certificate_string_array" num="1">
+    <string-array name="carrier_certificate_string_array" num="4">
       <item value="7D7226772D4F6D778FEF53A36BE15AD78D8D9D4BC4CE00C5F2E3216C19480FA0"/>
+      <item value="2333f4065b9f054363ca63d1866cc168f45d641645b31131b14e173b9c922d15:co.sitic.pp"/>
+      <item value="14d54c64599a3e9a3b766239b160de3935093e0a:co.sitic.pp"/>
+      <item value="f54cac11d5af77a5f10c21d536ad5d1c40b00d63a92cab917aa84dc714d622d8:co.sitic.pp"/>
     </string-array>
-
-    <string-array name="carrier_data_call_permanent_failure_strings" num="14">
-        <item value="OPERATOR_BARRED"/>
-        <item value="MISSING_UNKNOWN_APN"/>
-        <item value="UNKNOWN_PDP_ADDRESS_TYPE"/>
-        <item value="ACTIVATION_REJECT_GGSN"/>
-        <item value="SERVICE_OPTION_NOT_SUPPORTED"/>
-        <item value="NSAPI_IN_USE"/>
-        <item value="ONLY_IPV4_ALLOWED"/>
-        <item value="ONLY_IPV6_ALLOWED"/>
-        <item value="PROTOCOL_ERRORS"/>
-        <item value="RADIO_POWER_OFF"/>
-        <item value="TETHERED_CALL_ACTIVE"/>
-        <item value="RADIO_NOT_AVAILABLE"/>
-        <item value="UNACCEPTABLE_NETWORK_PARAMETER"/>
-        <item value="SIGNAL_LOST"/>
+    <string-array name="telephony_data_setup_retry_rules_string_array" num="4">
+        <item value="capabilities=eims, retry_interval=1000, maximum_retries=20"/>
+        <!-- Defines permanent failures. Removed USER_AUTHENTICATION and SERVICE_OPTION_NOT_SUBSCRIBED from default. -->
+        <item value="permanent_fail_causes=8|27|28|30|32|35|50|51|111|-5|-6|65537|65538|-3|65543|65547|2252|2253|2254, retry_interval=2500"/>
+        <item value="capabilities=mms|supl|cbs, retry_interval=2000"/>
+        <item value="capabilities=internet|enterprise|dun|ims|fota, retry_interval=2500|3000|5000|10000|15000|20000|40000|60000|120000|240000|600000|1200000|1800000, maximum_retries=20"/>
     </string-array>
     <boolean name="display_no_data_notification_on_permanent_failure_bool" value="true"/>
     <boolean name="unthrottle_data_retry_when_tac_changes_bool" value="true"/>
diff --git a/assets/carrier_config_carrierid_1925_Claro-PA.xml b/assets/carrier_config_carrierid_1925_Claro-PA.xml
index e8fde2f..ebe580f 100644
--- a/assets/carrier_config_carrierid_1925_Claro-PA.xml
+++ b/assets/carrier_config_carrierid_1925_Claro-PA.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <carrier_config>
-    <string-array name="carrier_certificate_string_array" num="1">
+    <string-array name="carrier_certificate_string_array" num="4">
       <item value="7D7226772D4F6D778FEF53A36BE15AD78D8D9D4BC4CE00C5F2E3216C19480FA0"/>
+      <item value="2333f4065b9f054363ca63d1866cc168f45d641645b31131b14e173b9c922d15:co.sitic.pp"/>
+      <item value="14d54c64599a3e9a3b766239b160de3935093e0a:co.sitic.pp"/>
+      <item value="f54cac11d5af77a5f10c21d536ad5d1c40b00d63a92cab917aa84dc714d622d8:co.sitic.pp"/>
     </string-array>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_1952_US-Cellular.xml b/assets/carrier_config_carrierid_1952_US-Cellular.xml
index 3882ddf..17cbd2d 100644
--- a/assets/carrier_config_carrierid_1952_US-Cellular.xml
+++ b/assets/carrier_config_carrierid_1952_US-Cellular.xml
@@ -23,4 +23,8 @@
     <string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
     <string name="sim_country_iso_override_string">us</string>
     <string name="uaProfTagName">x-wap-profile</string>
+    <string-array name="carrier_certificate_string_array" num="2">
+        <item value="8C960CA3CBF4A9DA851774F2DE072E57B1289A9CF7D6BDA4A6B386A42BC4FFB3:com.trustonic.telecoms.standard.dlc,com.trustonic.telecoms.client.standard.dlc.playground,com.trustonic.telecoms.standard.dpc"/>
+        <item value="7413E2B365230E1BCB294D687C3B87EE5BC7E3F9:com.trustonic.telecoms.standard.dlc,com.trustonic.telecoms.client.standard.dlc.playground,com.trustonic.telecoms.standard.dpc"/>
+    </string-array>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_1953_Claro-CR.xml b/assets/carrier_config_carrierid_1953_Claro-CR.xml
index e8fde2f..ebe580f 100644
--- a/assets/carrier_config_carrierid_1953_Claro-CR.xml
+++ b/assets/carrier_config_carrierid_1953_Claro-CR.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <carrier_config>
-    <string-array name="carrier_certificate_string_array" num="1">
+    <string-array name="carrier_certificate_string_array" num="4">
       <item value="7D7226772D4F6D778FEF53A36BE15AD78D8D9D4BC4CE00C5F2E3216C19480FA0"/>
+      <item value="2333f4065b9f054363ca63d1866cc168f45d641645b31131b14e173b9c922d15:co.sitic.pp"/>
+      <item value="14d54c64599a3e9a3b766239b160de3935093e0a:co.sitic.pp"/>
+      <item value="f54cac11d5af77a5f10c21d536ad5d1c40b00d63a92cab917aa84dc714d622d8:co.sitic.pp"/>
     </string-array>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_1954_Claro-SV.xml b/assets/carrier_config_carrierid_1954_Claro-SV.xml
index e8fde2f..ebe580f 100644
--- a/assets/carrier_config_carrierid_1954_Claro-SV.xml
+++ b/assets/carrier_config_carrierid_1954_Claro-SV.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <carrier_config>
-    <string-array name="carrier_certificate_string_array" num="1">
+    <string-array name="carrier_certificate_string_array" num="4">
       <item value="7D7226772D4F6D778FEF53A36BE15AD78D8D9D4BC4CE00C5F2E3216C19480FA0"/>
+      <item value="2333f4065b9f054363ca63d1866cc168f45d641645b31131b14e173b9c922d15:co.sitic.pp"/>
+      <item value="14d54c64599a3e9a3b766239b160de3935093e0a:co.sitic.pp"/>
+      <item value="f54cac11d5af77a5f10c21d536ad5d1c40b00d63a92cab917aa84dc714d622d8:co.sitic.pp"/>
     </string-array>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_1955_Claro-PR.xml b/assets/carrier_config_carrierid_1955_Claro-PR.xml
index 6d2cf25..98e0171 100644
--- a/assets/carrier_config_carrierid_1955_Claro-PR.xml
+++ b/assets/carrier_config_carrierid_1955_Claro-PR.xml
@@ -1,11 +1,14 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-6" standalone="yes"?>
 <carrier_config>
     <boolean name="enableGroupMms" value="false"/>
     <int name="smsToMmsTextThreshold" value="6"/>
     <int name="recipientLimit" value="20"/>
     <int name="maxSubjectLength" value="80"/>
     <int name="maxMessageSize" value="1048576"/>
-    <string-array name="carrier_certificate_string_array" num="1">
+    <string-array name="carrier_certificate_string_array" num="4">
       <item value="7D7226772D4F6D778FEF53A36BE15AD78D8D9D4BC4CE00C5F2E3216C19480FA0"/>
+      <item value="2333f4065b9f054363ca63d1866cc168f45d641645b31131b14e173b9c922d15:co.sitic.pp"/>
+      <item value="14d54c64599a3e9a3b766239b160de3935093e0a:co.sitic.pp"/>
+      <item value="f54cac11d5af77a5f10c21d536ad5d1c40b00d63a92cab917aa84dc714d622d8:co.sitic.pp"/>
     </string-array>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_2032_XFINIY-Mobile.xml b/assets/carrier_config_carrierid_2032_XFINIY-Mobile.xml
index 0f57c09..8ca6b19 100644
--- a/assets/carrier_config_carrierid_2032_XFINIY-Mobile.xml
+++ b/assets/carrier_config_carrierid_2032_XFINIY-Mobile.xml
@@ -77,21 +77,12 @@
         <item value="*71"/>
         <item value="*72"/>
     </string-array>
-    <string-array name="carrier_data_call_permanent_failure_strings" num="14">
-        <item value="OPERATOR_BARRED"/>
-        <item value="MISSING_UNKNOWN_APN"/>
-        <item value="UNKNOWN_PDP_ADDRESS_TYPE"/>
-        <item value="USER_AUTHENTICATION"/>
-        <item value="SERVICE_OPTION_NOT_SUPPORTED"/>
-        <item value="SERVICE_OPTION_NOT_SUBSCRIBED"/>
-        <item value="NSAPI_IN_USE"/>
-        <item value="ONLY_IPV4_ALLOWED"/>
-        <item value="ONLY_IPV6_ALLOWED"/>
-        <item value="RADIO_POWER_OFF"/>
-        <item value="TETHERED_CALL_ACTIVE"/>
-        <item value="RADIO_NOT_AVAILABLE"/>
-        <item value="UNACCEPTABLE_NETWORK_PARAMETER"/>
-        <item value="SIGNAL_LOST"/>
+    <string-array name="telephony_data_setup_retry_rules_string_array" num="4">
+        <item value="capabilities=eims, retry_interval=1000, maximum_retries=20"/>
+        <!-- Defines permanent failures. Removed ACTIVATION_REJECT_GGSN and PROTOCOL_ERRORS from default. -->
+        <item value="permanent_fail_causes=8|27|28|29|32|33|35|50|51|-5|-6|65537|65538|-3|65543|65547|2252|2253|2254, retry_interval=2500"/>
+        <item value="capabilities=mms|supl|cbs, retry_interval=2000"/>
+        <item value="capabilities=internet|enterprise|dun|ims|fota, retry_interval=2500|3000|5000|10000|15000|20000|40000|60000|120000|240000|600000|1200000|1800000, maximum_retries=20"/>
     </string-array>
     <string-array name="carrier_metered_apn_types_strings" num="3">
         <item value="default"/>
diff --git a/assets/carrier_config_carrierid_2088_Crnogorski-Telekom.xml b/assets/carrier_config_carrierid_2088_Crnogorski-Telekom.xml
index 5772711..119720f 100644
--- a/assets/carrier_config_carrierid_2088_Crnogorski-Telekom.xml
+++ b/assets/carrier_config_carrierid_2088_Crnogorski-Telekom.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <carrier_config>
     <boolean name="display_hd_audio_property_bool" value="false"/>
-    <string-array name="carrier_certificate_string_array" num="5">
+    <string-array name="carrier_certificate_string_array" num="7">
         <item value="191A9C9711282CCD1133C9F9EFA7D1077BCAAFB99E379A438207EE0D86218917:de.telekom.tsc"/>
         <item value="EE403A97B076CDEA7A8E8E9BC8011C0A45CEC08905F400EBECE62C946614977D:de.telekom.appstarter"/>
         <item value="1C97892608B6AA80C3B4AC5D41E3B4C4D5551C0585A923B4D82F77A961F3427E:com.morescreens.cgt"/>
         <item value="D0284ECDB391CF7AC3FE44A0966C149148FF77A8E33AC6C3260FEB43E29C3EEE:me.telekom.myaccount"/>
         <item value="5B149BCFB8533EE87A012A086634958270CE937F9EAC6CAAC35A614B1129EF6C:com.telekom.telekomme"/>
+        <item value="D2CB8644879FEC7DD2556673ADAF8F68899A4F2A93EEE14AD9482247B16AD02F:de.telekom.smartcredentials.entitlements"/>
+        <item value="FFEE87CCC88845E8918C7271318A9B3A9F4222F8D71F1D84D1B0C88789147F03:de.telekom.tsc,de.telekom.appstarter,de.telekom.smartcredentials.entitlements"/>
     </string-array>
-</carrier_config>
\ No newline at end of file
+</carrier_config>
diff --git a/assets/carrier_config_carrierid_2091_Bonbon.xml b/assets/carrier_config_carrierid_2091_Bonbon.xml
index 579b438..38bdbe0 100644
--- a/assets/carrier_config_carrierid_2091_Bonbon.xml
+++ b/assets/carrier_config_carrierid_2091_Bonbon.xml
@@ -7,9 +7,11 @@
         <item value="95"/>
         <item value="96"/>
     </string-array>
-    <string-array name="carrier_certificate_string_array" num="3">
+    <string-array name="carrier_certificate_string_array" num="5">
         <item value="191A9C9711282CCD1133C9F9EFA7D1077BCAAFB99E379A438207EE0D86218917:de.telekom.tsc"/>
         <item value="EE403A97B076CDEA7A8E8E9BC8011C0A45CEC08905F400EBECE62C946614977D:de.telekom.appstarter"/>
         <item value="CC12A9016142DD2080D20F8075C5CC418F64423D3EA773AEC3C838A51508569C:com.hrvatskitelekom.m.mojT"/>
+        <item value="D2CB8644879FEC7DD2556673ADAF8F68899A4F2A93EEE14AD9482247B16AD02F:de.telekom.smartcredentials.entitlements"/>
+        <item value="FFEE87CCC88845E8918C7271318A9B3A9F4222F8D71F1D84D1B0C88789147F03:de.telekom.tsc,de.telekom.appstarter,de.telekom.smartcredentials.entitlements"/>
     </string-array>
-</carrier_config>
\ No newline at end of file
+</carrier_config>
diff --git a/assets/carrier_config_carrierid_2092_congstar.xml b/assets/carrier_config_carrierid_2092_congstar.xml
index 53960d3..0b3d1d6 100644
--- a/assets/carrier_config_carrierid_2092_congstar.xml
+++ b/assets/carrier_config_carrierid_2092_congstar.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <carrier_config>
-    <string-array name="carrier_certificate_string_array" num="7">
+    <string-array name="carrier_certificate_string_array" num="8">
         <item value="191A9C9711282CCD1133C9F9EFA7D1077BCAAFB99E379A438207EE0D86218917:de.telekom.tsc"/>
         <item value="EE403A97B076CDEA7A8E8E9BC8011C0A45CEC08905F400EBECE62C946614977D:de.telekom.appstarter,de.telekom.android.customercenter"/>
         <item value="D2CB8644879FEC7DD2556673ADAF8F68899A4F2A93EEE14AD9482247B16AD02F:de.telekom.smartcredentials.entitlements"/>
@@ -8,5 +8,6 @@
         <item value="326D12BC1FC90959DA07EFE47CC23949E4E565E78BF7BECFAA919F7F7D9276A3:de.congstar.fraenk"/>
         <item value="4D78B2097356EE799070B338663690098602E9CE31C33FEBAA5D50D4548B2E31:de.congstar.ja,de.congstar.penny"/>
         <item value="B9A55B3103894C87ABDF014BC15AB42CC4EC7E226B59CA1539F5C2AFF6D64CF7:de.telekom.bflexz"/>
+        <item value="FFEE87CCC88845E8918C7271318A9B3A9F4222F8D71F1D84D1B0C88789147F03:de.telekom.tsc,de.telekom.appstarter,de.telekom.smartcredentials.entitlements,de.telekom.android.customercenter,de.congstar.meincongstar,de.congstar.fraenk,de.congstar.ja,de.congstar.penny,de.telekom.bflexz"/>
     </string-array>
-</carrier_config>
\ No newline at end of file
+</carrier_config>
diff --git a/assets/carrier_config_carrierid_2110_UQ-mobile.xml b/assets/carrier_config_carrierid_2110_UQ-mobile.xml
index b0b5712..1bc868c 100644
--- a/assets/carrier_config_carrierid_2110_UQ-mobile.xml
+++ b/assets/carrier_config_carrierid_2110_UQ-mobile.xml
@@ -9,4 +9,10 @@
     <boolean name="nr_timers_reset_if_non_endc_and_rrc_idle_bool" value="true"/>
     <boolean name="carrier_name_override_bool" value="true"/>
     <string name="carrier_name_string">UQ mobile</string>
+    <string-array name="carrier_certificate_string_array" num="4">
+        <item value="108897103871B684844AA7C791E0C812AB3966576FB5D3713C2D11794C0600AD:com.kddi.cs.app001"/>
+        <item value="5EA3181DF228B4F8B0DECC10B21783F8C6C397F1290F2395FE3E6FDB2B52E991:jp.uqmobile.uqmobileportalapp"/>
+        <item value="891ABE3F0A0D794AD46200DC2374AFF61AFA82711C360EE0CB49C3E6BB2BA006:jp.auone.wallet"/>
+        <item value="1001568BB4A4E65F68C8B0F2E5C9EBC97FF719898F39E421DAF29A8DACEAAF1B:com.kddi.android.cmail"/>
+    </string-array>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_2363_Crnogorski-Telekom.xml b/assets/carrier_config_carrierid_2363_Crnogorski-Telekom.xml
index bf3f4ad..3938944 100644
--- a/assets/carrier_config_carrierid_2363_Crnogorski-Telekom.xml
+++ b/assets/carrier_config_carrierid_2363_Crnogorski-Telekom.xml
@@ -7,4 +7,4 @@
         <item value="D0284ECDB391CF7AC3FE44A0966C149148FF77A8E33AC6C3260FEB43E29C3EEE:me.telekom.myaccount"/>
         <item value="5B149BCFB8533EE87A012A086634958270CE937F9EAC6CAAC35A614B1129EF6C:com.telekom.telekomme"/>
     </string-array>
-</carrier_config>
\ No newline at end of file
+</carrier_config>
diff --git a/assets/carrier_config_carrierid_2395_Telekom.xml b/assets/carrier_config_carrierid_2395_Telekom.xml
index fc8385a..48d841a 100644
--- a/assets/carrier_config_carrierid_2395_Telekom.xml
+++ b/assets/carrier_config_carrierid_2395_Telekom.xml
@@ -16,4 +16,4 @@
         <item value="4D78B2097356EE799070B338663690098602E9CE31C33FEBAA5D50D4548B2E31:de.congstar.ja,de.congstar.penny"/>
         <item value="B9A55B3103894C87ABDF014BC15AB42CC4EC7E226B59CA1539F5C2AFF6D64CF7:de.telekom.bflexz"/>
     </string-array>
-</carrier_config>
\ No newline at end of file
+</carrier_config>
diff --git a/assets/carrier_config_carrierid_2429_Rakuten-Mobile-MNO.xml b/assets/carrier_config_carrierid_2429_Rakuten-Mobile-MNO.xml
index 26cf1b3..0606bed 100644
--- a/assets/carrier_config_carrierid_2429_Rakuten-Mobile-MNO.xml
+++ b/assets/carrier_config_carrierid_2429_Rakuten-Mobile-MNO.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <carrier_config>
     <string name="5g_icon_configuration_string">connected_mmwave:5G,connected:5G,not_restricted_rrc_idle:5G</string>
-    <string name="5g_icon_display_grace_period_string">connected_mmwave,legacy,31;connected,legacy,31;connected_mmwave,not_restricted_rrc_con,31;connected,not_restricted_rrc_con,31;not_restricted_rrc_idle,not_restricted_rrc_con,15</string>
+    <string name="5g_icon_display_grace_period_string">connected_mmwave,legacy,15;connected,legacy,15;connected_mmwave,not_restricted_rrc_con,15;connected,not_restricted_rrc_con,15;not_restricted_rrc_idle,not_restricted_rrc_con,15</string>
     <boolean name="enabledMMS" value="false"/>
     <int name="maxMessageSize" value="2097152"/>
     <int name="maxImageHeight" value="1944"/>
diff --git a/assets/carrier_config_carrierid_2514_povo.xml b/assets/carrier_config_carrierid_2514_povo.xml
index a1879b3..0e453a8 100644
--- a/assets/carrier_config_carrierid_2514_povo.xml
+++ b/assets/carrier_config_carrierid_2514_povo.xml
@@ -9,4 +9,10 @@
     <boolean name="nr_timers_reset_if_non_endc_and_rrc_idle_bool" value="true"/>
     <boolean name="carrier_name_override_bool" value="true"/>
     <string name="carrier_name_string">povo</string>
+    <string-array name="carrier_certificate_string_array" num="4">
+        <item value="108897103871B684844AA7C791E0C812AB3966576FB5D3713C2D11794C0600AD:com.kddi.cs.app001"/>
+        <item value="5EA3181DF228B4F8B0DECC10B21783F8C6C397F1290F2395FE3E6FDB2B52E991:jp.uqmobile.uqmobileportalapp"/>
+        <item value="891ABE3F0A0D794AD46200DC2374AFF61AFA82711C360EE0CB49C3E6BB2BA006:jp.auone.wallet"/>
+        <item value="1001568BB4A4E65F68C8B0F2E5C9EBC97FF719898F39E421DAF29A8DACEAAF1B:com.kddi.android.cmail"/>
+    </string-array>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_2548_Ice.xml b/assets/carrier_config_carrierid_2548_Ice.xml
new file mode 100644
index 0000000..b986b6d
--- /dev/null
+++ b/assets/carrier_config_carrierid_2548_Ice.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!--
+  ~ Copyright (C) 2022 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<carrier_config>
+    <int name="wfc_spn_format_idx_int" value="1"/>
+</carrier_config>
diff --git a/assets/carrier_config_mccmnc_23207.xml b/assets/carrier_config_carrierid_2551_Magenta_Telekom.xml
index 8178f87..8178f87 100644
--- a/assets/carrier_config_mccmnc_23207.xml
+++ b/assets/carrier_config_carrierid_2551_Magenta_Telekom.xml
diff --git a/assets/carrier_config_carrierid_34_Movistar.xml b/assets/carrier_config_carrierid_34_Movistar.xml
index 12909cc..09f74bb 100644
--- a/assets/carrier_config_carrierid_34_Movistar.xml
+++ b/assets/carrier_config_carrierid_34_Movistar.xml
@@ -30,4 +30,22 @@
     <item value="e1b6e6cbfe0673164931be46d95fa7e43fb92dac49acc10a6c0909e5eada15fa"/>
   </string-array>
   <string name="call_redirection_service_component_name_string">com.movistar.android.mimovistar.es/com.tuenti.messenger.callinterceptor.CallInterceptorService</string>
+  <string-array name="carrier_service_name_array" num="7">
+    <item value="Atención al Cliente"/>
+    <item value="At. Cliente (extranjero)"/>
+    <item value="Inf. 11822"/>
+    <item value="Activar Buzón Movistar"/>
+    <item value="Emergencias"/>
+    <item value="Atención Negocios"/>
+    <item value="At. Ciberseguridad INCIBE"/>
+  </string-array>
+  <string-array name="carrier_service_number_array" num="7">
+    <item value="1004"/>
+    <item value="+34699991004"/>
+    <item value="11822"/>
+    <item value="22500"/>
+    <item value="112"/>
+    <item value="900101010"/>
+    <item value="017"/>
+  </string-array>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_3_Telekom.xml b/assets/carrier_config_carrierid_3_Telekom.xml
index c0f2f96..20c5555 100644
--- a/assets/carrier_config_carrierid_3_Telekom.xml
+++ b/assets/carrier_config_carrierid_3_Telekom.xml
@@ -3,7 +3,7 @@
     <boolean name="carrier_default_wfc_ims_roaming_enabled_bool" value="true"/>
     <boolean name="carrier_supports_ss_over_ut_bool" value="true"/>
     <string name="5g_icon_display_grace_period_string">connected_mmwave,legacy,10;connected,legacy,10;not_restricted_rrc_idle,legacy,10;not_restricted_rrc_con,legacy,10</string>
-    <string-array name="carrier_certificate_string_array" num="7">
+    <string-array name="carrier_certificate_string_array" num="8">
         <item value="191A9C9711282CCD1133C9F9EFA7D1077BCAAFB99E379A438207EE0D86218917:de.telekom.tsc"/>
         <item value="EE403A97B076CDEA7A8E8E9BC8011C0A45CEC08905F400EBECE62C946614977D:de.telekom.appstarter,de.telekom.android.customercenter"/>
         <item value="D2CB8644879FEC7DD2556673ADAF8F68899A4F2A93EEE14AD9482247B16AD02F:de.telekom.smartcredentials.entitlements"/>
@@ -11,5 +11,6 @@
         <item value="326D12BC1FC90959DA07EFE47CC23949E4E565E78BF7BECFAA919F7F7D9276A3:de.congstar.fraenk"/>
         <item value="4D78B2097356EE799070B338663690098602E9CE31C33FEBAA5D50D4548B2E31:de.congstar.ja,de.congstar.penny"/>
         <item value="B9A55B3103894C87ABDF014BC15AB42CC4EC7E226B59CA1539F5C2AFF6D64CF7:de.telekom.bflexz"/>
+        <item value="FFEE87CCC88845E8918C7271318A9B3A9F4222F8D71F1D84D1B0C88789147F03:de.telekom.tsc,de.telekom.appstarter,de.telekom.smartcredentials.entitlements,de.telekom.android.customercenter,de.congstar.meincongstar,de.congstar.fraenk,de.congstar.ja,de.congstar.penny,de.telekom.bflexz"/>
     </string-array>
 </carrier_config>
\ No newline at end of file
diff --git a/assets/carrier_config_carrierid_4_Magenta-Telekom.xml b/assets/carrier_config_carrierid_4_Magenta-Telekom.xml
index 877359f..eba572f 100644
--- a/assets/carrier_config_carrierid_4_Magenta-Telekom.xml
+++ b/assets/carrier_config_carrierid_4_Magenta-Telekom.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <carrier_config>
     <boolean name="display_hd_audio_property_bool" value="false"/>
-    <string-array name="carrier_certificate_string_array" num="3">
+    <string-array name="carrier_certificate_string_array" num="5">
         <item value="191A9C9711282CCD1133C9F9EFA7D1077BCAAFB99E379A438207EE0D86218917:de.telekom.tsc"/>
         <item value="EE403A97B076CDEA7A8E8E9BC8011C0A45CEC08905F400EBECE62C946614977D:de.telekom.appstarter"/>
         <item value="E19DB5D5DDB900229C81DEF1C8C86DD2457AFDEED7676C89DF6EF11D5EEA5E6D:at.tmobile.android.myt"/>
+        <item value="D2CB8644879FEC7DD2556673ADAF8F68899A4F2A93EEE14AD9482247B16AD02F:de.telekom.smartcredentials.entitlements"/>
+        <item value="FFEE87CCC88845E8918C7271318A9B3A9F4222F8D71F1D84D1B0C88789147F03:de.telekom.tsc,de.telekom.appstarter,de.telekom.smartcredentials.entitlements"/>
     </string-array>
 </carrier_config>
\ No newline at end of file
diff --git a/assets/carrier_config_carrierid_530_Vivo.xml b/assets/carrier_config_carrierid_530_Vivo.xml
index 7296860..57ae9c6 100644
--- a/assets/carrier_config_carrierid_530_Vivo.xml
+++ b/assets/carrier_config_carrierid_530_Vivo.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <carrier_config>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
+  <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
+  <string-array name="carrier_certificate_string_array" num="2">
+    <item value="406D7DE3DF7F58F4DDE4758ED79280566D9BB8CACF46DB725D6AFCB7E3D6EE8E:br.com.vivo"/>
+    <item value="45A8BFA55CA3B9DB73D35F0C9961803A47BC9B539053C0CB820DF0DB839EE85A:br.com.vivo.meuvivoempresas"/>
+  </string-array>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_6_T-Mobile.xml b/assets/carrier_config_carrierid_6_T-Mobile.xml
index 3d09265..62717db 100644
--- a/assets/carrier_config_carrierid_6_T-Mobile.xml
+++ b/assets/carrier_config_carrierid_6_T-Mobile.xml
@@ -3,9 +3,11 @@
     <boolean name="carrier_volte_available_bool" value="true"/>
     <boolean name="display_hd_audio_property_bool" value="false"/>
     <int name="volte_replacement_rat_int" value="3"/>
-    <string-array name="carrier_certificate_string_array" num="3">
+    <string-array name="carrier_certificate_string_array" num="5">
         <item value="191A9C9711282CCD1133C9F9EFA7D1077BCAAFB99E379A438207EE0D86218917:de.telekom.tsc"/>
         <item value="EE403A97B076CDEA7A8E8E9BC8011C0A45CEC08905F400EBECE62C946614977D:de.telekom.appstarter"/>
         <item value="A1F6E367AC03F6A0018EBF1F1FCDD971129F5BAA2A77FC1782B9ECF3C819FEF7:cz.tmobile.oneapp"/>
+        <item value="D2CB8644879FEC7DD2556673ADAF8F68899A4F2A93EEE14AD9482247B16AD02F:de.telekom.smartcredentials.entitlements"/>
+        <item value="FFEE87CCC88845E8918C7271318A9B3A9F4222F8D71F1D84D1B0C88789147F03:de.telekom.tsc,de.telekom.appstarter,de.telekom.smartcredentials.entitlements"/>
     </string-array>
 </carrier_config>
\ No newline at end of file
diff --git a/assets/carrier_config_carrierid_747_COSMOTE.xml b/assets/carrier_config_carrierid_747_COSMOTE.xml
index e9f39a7..61dd0ca 100644
--- a/assets/carrier_config_carrierid_747_COSMOTE.xml
+++ b/assets/carrier_config_carrierid_747_COSMOTE.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <carrier_config>
-    <string-array name="carrier_certificate_string_array" num="5">
+    <string-array name="carrier_certificate_string_array" num="7">
         <item value="191A9C9711282CCD1133C9F9EFA7D1077BCAAFB99E379A438207EE0D86218917:de.telekom.tsc"/>
         <item value="EE403A97B076CDEA7A8E8E9BC8011C0A45CEC08905F400EBECE62C946614977D:de.telekom.appstarter"/>
         <item value="1C435EDC05148B8A9365A8625FEFFC87B8289B83FD893C2877B27BB08ED2444D:gr.cosmote.myaccount.widget"/>
         <item value="4828585D815D9E27444FC38CD74D13296332043BBF53DA71277B6D5C1A97022B:gr.cosmote.whatsup"/>
         <item value="9F3DD33751029CD02AFC39D5C650533E542AA6E4FE0A647DF096B2F5D1907299:gr.cosmote.frog"/>
+        <item value="D2CB8644879FEC7DD2556673ADAF8F68899A4F2A93EEE14AD9482247B16AD02F:de.telekom.smartcredentials.entitlements"/>
+        <item value="FFEE87CCC88845E8918C7271318A9B3A9F4222F8D71F1D84D1B0C88789147F03:de.telekom.tsc,de.telekom.appstarter,de.telekom.smartcredentials.entitlements"/>
     </string-array>
 </carrier_config>
\ No newline at end of file
diff --git a/assets/carrier_config_carrierid_773_Claro-HN.xml b/assets/carrier_config_carrierid_773_Claro-HN.xml
index 85e15d4..6c3b677 100644
--- a/assets/carrier_config_carrierid_773_Claro-HN.xml
+++ b/assets/carrier_config_carrierid_773_Claro-HN.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <carrier_config>
-    <string-array name="carrier_certificate_string_array" num="1">
+    <string-array name="carrier_certificate_string_array" num="4">
       <item value="7D7226772D4F6D778FEF53A36BE15AD78D8D9D4BC4CE00C5F2E3216C19480FA0"/>
+      <item value="2333f4065b9f054363ca63d1866cc168f45d641645b31131b14e173b9c922d15:co.sitic.pp"/>
+      <item value="14d54c64599a3e9a3b766239b160de3935093e0a:co.sitic.pp"/>
+      <item value="f54cac11d5af77a5f10c21d536ad5d1c40b00d63a92cab917aa84dc714d622d8:co.sitic.pp"/>
     </string-array>
     <string-array name="mmi_two_digit_number_pattern_string_array" num="2">
         <item value="*1"/>
diff --git a/assets/carrier_config_carrierid_7_T-Mobile.xml b/assets/carrier_config_carrierid_7_T-Mobile.xml
index 805b6f0..1948d14 100644
--- a/assets/carrier_config_carrierid_7_T-Mobile.xml
+++ b/assets/carrier_config_carrierid_7_T-Mobile.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <carrier_config>
     <boolean name="display_hd_audio_property_bool" value="false"/>
-    <string-array name="carrier_certificate_string_array" num="3">
+    <string-array name="carrier_certificate_string_array" num="5">
         <item value="191A9C9711282CCD1133C9F9EFA7D1077BCAAFB99E379A438207EE0D86218917:de.telekom.tsc"/>
         <item value="EE403A97B076CDEA7A8E8E9BC8011C0A45CEC08905F400EBECE62C946614977D:de.telekom.appstarter"/>
         <item value="46D1992DA14DCDAB5CDF8D3C4C965D5D11A2534A40F323DFFF127751B706724F:pl.tmobile.miboa"/>
+        <item value="D2CB8644879FEC7DD2556673ADAF8F68899A4F2A93EEE14AD9482247B16AD02F:de.telekom.smartcredentials.entitlements"/>
+        <item value="FFEE87CCC88845E8918C7271318A9B3A9F4222F8D71F1D84D1B0C88789147F03:de.telekom.tsc,de.telekom.appstarter,de.telekom.smartcredentials.entitlements"/>
     </string-array>
 </carrier_config>
\ No newline at end of file
diff --git a/assets/carrier_config_carrierid_8_Magyar-Telekom.xml b/assets/carrier_config_carrierid_8_Magyar-Telekom.xml
index b148c3d..2c63a9d 100644
--- a/assets/carrier_config_carrierid_8_Magyar-Telekom.xml
+++ b/assets/carrier_config_carrierid_8_Magyar-Telekom.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <carrier_config>
     <boolean name="display_hd_audio_property_bool" value="false"/>
-    <string-array name="carrier_certificate_string_array" num="3">
+    <string-array name="carrier_certificate_string_array" num="5">
         <item value="191A9C9711282CCD1133C9F9EFA7D1077BCAAFB99E379A438207EE0D86218917:de.telekom.tsc"/>
         <item value="EE403A97B076CDEA7A8E8E9BC8011C0A45CEC08905F400EBECE62C946614977D:de.telekom.appstarter"/>
         <item value="7A9B86BEA0983E9999B7991A29654B8E6BE50AEAFD38200DCF2B32B951F0AA5D:hu.telekom.telekomapp"/>
+        <item value="D2CB8644879FEC7DD2556673ADAF8F68899A4F2A93EEE14AD9482247B16AD02F:de.telekom.smartcredentials.entitlements"/>
+        <item value="FFEE87CCC88845E8918C7271318A9B3A9F4222F8D71F1D84D1B0C88789147F03:de.telekom.tsc,de.telekom.appstarter,de.telekom.smartcredentials.entitlements"/>
     </string-array>
 </carrier_config>
\ No newline at end of file
diff --git a/assets/carrier_config_carrierid_9_Hrvaski-Telekom.xml b/assets/carrier_config_carrierid_9_Hrvaski-Telekom.xml
index f74f9ff..d9406d8 100644
--- a/assets/carrier_config_carrierid_9_Hrvaski-Telekom.xml
+++ b/assets/carrier_config_carrierid_9_Hrvaski-Telekom.xml
@@ -8,9 +8,11 @@
         <item value="95"/>
         <item value="96"/>
     </string-array>
-    <string-array name="carrier_certificate_string_array" num="3">
+    <string-array name="carrier_certificate_string_array" num="5">
         <item value="191A9C9711282CCD1133C9F9EFA7D1077BCAAFB99E379A438207EE0D86218917:de.telekom.tsc"/>
         <item value="EE403A97B076CDEA7A8E8E9BC8011C0A45CEC08905F400EBECE62C946614977D:de.telekom.appstarter"/>
         <item value="CC12A9016142DD2080D20F8075C5CC418F64423D3EA773AEC3C838A51508569C:com.hrvatskitelekom.m.mojT"/>
+        <item value="D2CB8644879FEC7DD2556673ADAF8F68899A4F2A93EEE14AD9482247B16AD02F:de.telekom.smartcredentials.entitlements"/>
+        <item value="FFEE87CCC88845E8918C7271318A9B3A9F4222F8D71F1D84D1B0C88789147F03:de.telekom.tsc,de.telekom.appstarter,de.telekom.smartcredentials.entitlements"/>
     </string-array>
 </carrier_config>
\ No newline at end of file
diff --git a/src/com/android/carrierconfig/DefaultCarrierConfigService.java b/src/com/android/carrierconfig/DefaultCarrierConfigService.java
index 0275d06..768271f 100644
--- a/src/com/android/carrierconfig/DefaultCarrierConfigService.java
+++ b/src/com/android/carrierconfig/DefaultCarrierConfigService.java
@@ -261,9 +261,9 @@ public class DefaultCarrierConfigService extends CarrierService {
      * Checks to see if an XML node matches carrier filters.
      *
      * <p>This iterates over the attributes of the current tag pointed to by {@code parser} and
-     * checks each one against {@code id} or {@link Build.DEVICE} or {@link R.string#sku_filter}.
-     * Attributes that are not specified in the node will not be checked, so a node with no
-     * attributes will always return true. The supported filter attributes are,
+     * checks each one against {@code id} or {@link Build.DEVICE} or {@link R.string#sku_filter} or
+     * {@link Build.BOARD}. Attributes that are not specified in the node will not be checked, so a
+     * node with no attributes will always return true. The supported filter attributes are,
      * <ul>
      *   <li>mcc: {@link CarrierIdentifier#getMcc}</li>
      *   <li>mnc: {@link CarrierIdentifier#getMnc}</li>
@@ -274,6 +274,7 @@ public class DefaultCarrierConfigService extends CarrierService {
      *   <li>device: {@link Build.DEVICE}</li>
      *   <li>vendorSku: {@link SystemConfig.VENDOR_SKU_PROPERTY}</li>
      *   <li>hardwareSku: {@link SystemConfig.SKU_PROPERTY}</li>
+     *   <li>board: {@link Build.BOARD}</li>
      *   <li>cid: {@link CarrierIdentifier#getCarrierId()}
      *   or {@link CarrierIdentifier#getSpecificCarrierId()}</li>
      *   <li>sku: {@link R.string#sku_filter} "sku_filter" that OEM customizable filter</li>
@@ -328,6 +329,9 @@ public class DefaultCarrierConfigService extends CarrierService {
                 case "hardwareSku":
                     result = value.equalsIgnoreCase(hardwareSkuProperty);
                     break;
+                case "board":
+                    result = value.equalsIgnoreCase(Build.BOARD);
+                    break;
                 case "cid":
                     result = (id == null) || (Integer.parseInt(value) == id.getCarrierId())
                                 || (Integer.parseInt(value) == id.getSpecificCarrierId());
diff --git a/tests/src/com/android/carrierconfig/CarrierConfigTest.java b/tests/src/com/android/carrierconfig/CarrierConfigTest.java
index 308524b..4d753a1 100644
--- a/tests/src/com/android/carrierconfig/CarrierConfigTest.java
+++ b/tests/src/com/android/carrierconfig/CarrierConfigTest.java
@@ -86,6 +86,7 @@ public class CarrierConfigTest extends InstrumentationTestCase {
                                 case "device":
                                 case "vendorSku":
                                 case "hardwareSku":
+                                case "board":
                                 case "cid":
                                 case "name":
                                 case "sku":
@@ -275,6 +276,9 @@ public class CarrierConfigTest extends InstrumentationTestCase {
         names.addAll(getCarrierConfigXmlNames(CarrierConfigManager.class));
         for (Class nested : CarrierConfigManager.class.getDeclaredClasses()) {
             Log.i("CarrierConfigTest", nested.toString());
+            if (nested.isInterface()) {
+                continue;
+            }
             if (Modifier.isStatic(nested.getModifiers())) {
                 names.addAll(getCarrierConfigXmlNames(nested));
             }