Snap for 9470583 from bb1e0f293006c69aaec08681d9f8afbf9c7b991a to tm-qpr3-release
Change-Id: Idd2de6853dcf17f2137fd23eb4800f081856e961
diff --git a/assets/carrier_config_carrierid_1187_AT&T.xml b/assets/carrier_config_carrierid_1187_AT&T.xml
index 691811a..2206218 100644
--- a/assets/carrier_config_carrierid_1187_AT&T.xml
+++ b/assets/carrier_config_carrierid_1187_AT&T.xml
@@ -81,4 +81,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_1839_Verizon-Wireless.xml b/assets/carrier_config_carrierid_1839_Verizon-Wireless.xml
index 421bc18..690522c 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"/>
diff --git a/assets/carrier_config_carrierid_1913_Telcel.xml b/assets/carrier_config_carrierid_1913_Telcel.xml
index c518481..fe9264e 100644
--- a/assets/carrier_config_carrierid_1913_Telcel.xml
+++ b/assets/carrier_config_carrierid_1913_Telcel.xml
@@ -7,22 +7,12 @@
<string-array name="carrier_certificate_string_array" num="1">
<item value="7D7226772D4F6D778FEF53A36BE15AD78D8D9D4BC4CE00C5F2E3216C19480FA0"/>
</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_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_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>