Add carrier config for JP and TW carriers to enable 5g icon timer
Bug: 160365713
Bug: 160297194
Test: build pass.
Change-Id: I8d60997c05ca30cf9368a92f6bf55ff1da9a34e8
diff --git a/assets/carrier_config_carrierid_1581_au.xml b/assets/carrier_config_carrierid_1581_au.xml
index 5758e42..d71c2b6 100644
--- a/assets/carrier_config_carrierid_1581_au.xml
+++ b/assets/carrier_config_carrierid_1581_au.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<carrier_config>
+ <string name="5g_icon_configuration_string"
+ value="connected_mmwave:5G,connected:5G,not_restricted_rrc_idle:5G"/>
+ <string name="5g_icon_display_grace_period_string"
+ value="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"/>
<boolean name="carrier_supports_ss_over_ut_bool" value="true"/>
<boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
<boolean name="allow_emergency_numbers_in_call_log_bool" value="true"/>
- <string name="5g_icon_display_grace_period_string"
- value="connected_mmwave,legacy,31;connected,legacy,31;
- connected_mmwave,not_restricted_rrc_con,31;connected,not_restricted_rrc_con,31;
- not_restricted_rrc_idle,legacy,15;not_restricted_rrc_idle,not_restricted_rrc_con,15"/>
<boolean name="disable_dun_apn_while_roaming" value="true"/>
+ <boolean name="nr_timers_reset_if_non_endc_and_rrc_idle_bool" value="true"/>
</carrier_config>
diff --git "a/assets/carrier_config_carrierid_1881_\351\201\240\345\202\263\351\233\273\344\277\241-Far-EasTone-Telecom.xml" "b/assets/carrier_config_carrierid_1881_\351\201\240\345\202\263\351\233\273\344\277\241-Far-EasTone-Telecom.xml"
index e94c884..3b84346 100644
--- "a/assets/carrier_config_carrierid_1881_\351\201\240\345\202\263\351\233\273\344\277\241-Far-EasTone-Telecom.xml"
+++ "b/assets/carrier_config_carrierid_1881_\351\201\240\345\202\263\351\233\273\344\277\241-Far-EasTone-Telecom.xml"
@@ -1,6 +1,13 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<carrier_config>
+ <string name="5g_icon_configuration_string"
+ value="connected_mmwave:5G,connected:5G,not_restricted_rrc_idle:5G"/>
+ <string name="5g_icon_display_grace_period_string"
+ value="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"/>
<boolean name="carrier_default_wfc_ims_roaming_enabled_bool" value="true" />
<boolean name="hide_lte_plus_data_icon_bool" value="false"/>
<boolean name="support_ims_conference_event_package_bool" value="false"/>
+ <boolean name="nr_timers_reset_if_non_endc_and_rrc_idle_bool" value="true"/>
</carrier_config>
diff --git "a/assets/carrier_config_carrierid_1884_\344\270\255\350\217\257\351\233\273\344\277\241_Chunghwa-Telecom.xml" "b/assets/carrier_config_carrierid_1884_\344\270\255\350\217\257\351\233\273\344\277\241_Chunghwa-Telecom.xml"
index 3ab3d3e..8620301 100644
--- "a/assets/carrier_config_carrierid_1884_\344\270\255\350\217\257\351\233\273\344\277\241_Chunghwa-Telecom.xml"
+++ "b/assets/carrier_config_carrierid_1884_\344\270\255\350\217\257\351\233\273\344\277\241_Chunghwa-Telecom.xml"
@@ -1,6 +1,13 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<carrier_config>
+ <string name="5g_icon_configuration_string"
+ value="connected_mmwave:5G,connected:5G,not_restricted_rrc_idle:5G"/>
+ <string name="5g_icon_display_grace_period_string"
+ value="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"/>
<boolean name="carrier_default_wfc_ims_roaming_enabled_bool" value="true" />
<boolean name="carrier_supports_ss_over_ut_bool" value="true"/>
<boolean name="hide_lte_plus_data_icon_bool" value="false"/>
+ <boolean name="nr_timers_reset_if_non_endc_and_rrc_idle_bool" value="true"/>
</carrier_config>
diff --git "a/assets/carrier_config_carrierid_1888_\345\217\260\347\201\243\345\244\247\345\223\245\345\244\247-Taiwan-Mobile-Telecom.xml" "b/assets/carrier_config_carrierid_1888_\345\217\260\347\201\243\345\244\247\345\223\245\345\244\247-Taiwan-Mobile-Telecom.xml"
index c7d168b..3105a03 100644
--- "a/assets/carrier_config_carrierid_1888_\345\217\260\347\201\243\345\244\247\345\223\245\345\244\247-Taiwan-Mobile-Telecom.xml"
+++ "b/assets/carrier_config_carrierid_1888_\345\217\260\347\201\243\345\244\247\345\223\245\345\244\247-Taiwan-Mobile-Telecom.xml"
@@ -1,6 +1,13 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<carrier_config>
+ <string name="5g_icon_configuration_string"
+ value="connected_mmwave:5G,connected:5G,not_restricted_rrc_idle:5G"/>
+ <string name="5g_icon_display_grace_period_string"
+ value="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"/>
<boolean name="carrier_supports_ss_over_ut_bool" value="true"/>
<boolean name="hide_lte_plus_data_icon_bool" value="false"/>
<boolean name="support_ims_conference_event_package_bool" value="false"/>
+ <boolean name="nr_timers_reset_if_non_endc_and_rrc_idle_bool" value="true"/>
</carrier_config>
diff --git a/assets/carrier_config_carrierid_1894_SoftBank.xml b/assets/carrier_config_carrierid_1894_SoftBank.xml
index d33f6b8..eb6749d 100644
--- a/assets/carrier_config_carrierid_1894_SoftBank.xml
+++ b/assets/carrier_config_carrierid_1894_SoftBank.xml
@@ -1,5 +1,11 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<carrier_config>
+ <string name="5g_icon_configuration_string"
+ value="connected_mmwave:5G,connected:5G,not_restricted_rrc_idle:5G"/>
+ <string name="5g_icon_display_grace_period_string"
+ value="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"/>
<boolean name="carrier_supports_ss_over_ut_bool" value="true"/>
<boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
<boolean name="enabledMMS" value="true"/>
@@ -12,11 +18,8 @@
<int name="maxImageHeight" value="1944"/>
<int name="maxMessageSize" value="307200"/>
<int name="maxImageWidth" value="2592"/>
+ <boolean name="nr_timers_reset_if_non_endc_and_rrc_idle_bool" value="true"/>
<int name="volte_replacement_rat_int" value="3"/>
<int name="ims_dtmf_tone_delay_int" value="215"/>
<string name="default_vm_number_string">1416</string>
- <string name="5g_icon_display_grace_period_string"
- value="connected_mmwave,legacy,15;connected,legacy,15;
- connected_mmwave,not_restricted_rrc_con,15;connected,not_restricted_rrc_con,15;
- not_restricted_rrc_idle,legacy,15;not_restricted_rrc_idle,not_restricted_rrc_con,15"/>
</carrier_config>
diff --git a/assets/carrier_config_carrierid_850_NTT_DOCOMO.xml b/assets/carrier_config_carrierid_850_NTT_DOCOMO.xml
index 1e5a7a4..d58ffc2 100644
--- a/assets/carrier_config_carrierid_850_NTT_DOCOMO.xml
+++ b/assets/carrier_config_carrierid_850_NTT_DOCOMO.xml
@@ -1,5 +1,11 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<carrier_config>
+ <string name="5g_icon_configuration_string"
+ value="connected_mmwave:5G,connected:5G,not_restricted_rrc_idle:5G"/>
+ <string name="5g_icon_display_grace_period_string"
+ value="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"/>
<boolean name="allow_emergency_numbers_in_call_log_bool" value="true"/>
<boolean name="carrier_volte_available_bool" value="true"/>
<boolean name="enabledMMS" value="false"/>
@@ -27,4 +33,5 @@
<!-- Incoming phone call while roaming history with caller id -->
<item value="^海外 着信通知（日本時間）\s*(?<month>0[1-9]|1[012])\/(?<day>0[1-9]|1[0-9]|2[0-9]|3[0-1]) (?<hour>[0-1][0-9]|2[0-3]):(?<minute>[0-5][0-9])\s*(?<callerId>[0-9]+)\s*$"/>
</string-array>
+ <boolean name="nr_timers_reset_if_non_endc_and_rrc_idle_bool" value="true"/>
</carrier_config>
