Merge Android 14 QPR2 to AOSP main

Bug: 319669529
Merged-In: I088402bb133b09f29f055adeb16dd4bab25786fd
Change-Id: I8bd67592e20fea131b56922247e4851205f57841

4 files changed, 65 insertions, 0 deletions

diff --git a/assets/carrier_config_carrierid_1404_TELUS-Mobility.xml b/assets/carrier_config_carrierid_1404_TELUS-Mobility.xml
index ca31614..89bf3bd 100644
--- a/assets/carrier_config_carrierid_1404_TELUS-Mobility.xml
+++ b/assets/carrier_config_carrierid_1404_TELUS-Mobility.xml
@@ -15,4 +15,12 @@
     <string-array name="read_only_apn_types_string_array" num="1">
         <item value="*"/>
     </string-array>
+    <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,connected,30;connected_mmwave,not_restricted_rrc_idle,30;connected_mmwave,not_restricted_rrc_con,30</string>
+    <int-array name="additional_nr_advanced_bands_int_array" num="1">
+        <item value="78"/>
+    </int-array>
+    <int name="nr_advanced_threshold_bandwidth_khz_int" value="60000"/>
+    <boolean name="enable_nr_advanced_for_roaming_bool" value="true"/>
+    <boolean name="include_lte_for_nr_advanced_threshold_bandwidth_bool" value="true"/>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_1_T-Mobile-US.xml b/assets/carrier_config_carrierid_1_T-Mobile-US.xml
index cec6091..f871ffa 100644
--- a/assets/carrier_config_carrierid_1_T-Mobile-US.xml
+++ b/assets/carrier_config_carrierid_1_T-Mobile-US.xml
@@ -48,4 +48,27 @@
         <item value="41"/>
     </int-array>
     <boolean name="enable_nr_advanced_for_roaming_bool" value="false"/>
+    <boolean name="show_roaming_indicator_bool" value="false"/>
+    <string-array name="data_connected_roaming_notification_excluded_mccs_string_array" num="7">
+        <item value="310"/>
+        <item value="311"/>
+        <item value="312"/>
+        <item value="313"/>
+        <item value="314"/>
+        <item value="315"/>
+        <item value="316"/>
+    </string-array>
+    <string-array name="data_connected_roaming_notification_included_mcc_mncs_string_array" num="11">
+        <item value="310032"/>
+        <item value="310033"/>
+        <item value="310110"/>
+        <item value="310140"/>
+        <item value="310370"/>
+        <item value="310400"/>
+        <item value="310470"/>
+        <item value="310500"/>
+        <item value="310970"/>
+        <item value="311170"/>
+        <item value="311250"/>
+    </string-array>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_2020_Koodo-Mobile.xml b/assets/carrier_config_carrierid_2020_Koodo-Mobile.xml
index 6e9e160..48d8918 100644
--- a/assets/carrier_config_carrierid_2020_Koodo-Mobile.xml
+++ b/assets/carrier_config_carrierid_2020_Koodo-Mobile.xml
@@ -1,4 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <carrier_config>
     <boolean name="carrier_supports_ss_over_ut_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>
+    <string name="5g_icon_display_grace_period_string">connected_mmwave,connected,30;connected_mmwave,not_restricted_rrc_idle,30;connected_mmwave,not_restricted_rrc_con,30</string>
+    <int-array name="additional_nr_advanced_bands_int_array" num="1">
+        <item value="78"/>
+    </int-array>
+    <int name="nr_advanced_threshold_bandwidth_khz_int" value="60000"/>
+    <boolean name="enable_nr_advanced_for_roaming_bool" value="true"/>
+    <boolean name="include_lte_for_nr_advanced_threshold_bandwidth_bool" value="true"/>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_2089_Public-Mobile.xml b/assets/carrier_config_carrierid_2089_Public-Mobile.xml
new file mode 100644
index 0000000..dc119e9
--- /dev/null
+++ b/assets/carrier_config_carrierid_2089_Public-Mobile.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!--
+  ~ Copyright (C) 2023 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>
+    <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,connected,30;connected_mmwave,not_restricted_rrc_idle,30;connected_mmwave,not_restricted_rrc_con,30</string>
+    <int-array name="additional_nr_advanced_bands_int_array" num="1">
+        <item value="78"/>
+    </int-array>
+    <int name="nr_advanced_threshold_bandwidth_khz_int" value="60000"/>
+    <boolean name="enable_nr_advanced_for_roaming_bool" value="true"/>
+    <boolean name="include_lte_for_nr_advanced_threshold_bandwidth_bool" value="true"/>
+</carrier_config>