diff options
| author | Jack Yu <jackyu@google.com> | 2017-05-04 11:51:57 -0700 |
|---|---|---|
| committer | Jack Yu <jackyu@google.com> | 2017-05-04 17:02:10 -0700 |
| commit | 23190fcda9d8b9ca4d944d42082da75c3a9178d9 (patch) | |
| tree | 3a083f91aa738e10f59ad112ea2f6651a8155d55 | |
| parent | 179682d27a1eefb08bf02c70ccd3b0c2d3dd90a3 (diff) | |
| download | android_packages_apps_CarrierConfig-23190fcda9d8b9ca4d944d42082da75c3a9178d9.tar.gz android_packages_apps_CarrierConfig-23190fcda9d8b9ca4d944d42082da75c3a9178d9.tar.bz2 android_packages_apps_CarrierConfig-23190fcda9d8b9ca4d944d42082da75c3a9178d9.zip | |
Moved channels settings from carrier config to resources
Since CBS channels are more countries specific instead
of carrier specific, moving it to resources makes
more sense.
Test: Manual
bug: 31223529
Change-Id: I98228d9a8d1a788b32a79e0a207115f2e3e6919f
| -rw-r--r-- | assets/carrier_config_44010.xml | 4 | ||||
| -rw-r--r-- | assets/carrier_config_44020.xml | 6 | ||||
| -rw-r--r-- | assets/carrier_config_44050.xml | 3 | ||||
| -rw-r--r-- | assets/carrier_config_44051.xml | 3 | ||||
| -rw-r--r-- | assets/carrier_config_44052.xml | 8 |
5 files changed, 0 insertions, 24 deletions
diff --git a/assets/carrier_config_44010.xml b/assets/carrier_config_44010.xml index 845b895..73b212e 100644 --- a/assets/carrier_config_44010.xml +++ b/assets/carrier_config_44010.xml @@ -9,10 +9,6 @@ <boolean name="always_show_emergency_alert_onoff_bool" value="true" /> <long name="message_expiration_time_long" value="3600000" /> <boolean name="ignore_data_enabled_changed_for_video_calls" value="true" /> -<string-array name="carrier_additional_cbs_channels_strings" num="2"> - <item value="0xA001-0xA002:type=other, emergency=true" /> - <item value="0xA004-0xA3FF:type=other, emergency=true" /> -</string-array> <boolean name="allow_emergency_numbers_in_call_log_bool" value="true" /> </carrier_config> </carrier_config_list> diff --git a/assets/carrier_config_44020.xml b/assets/carrier_config_44020.xml index 32e4a19..cc8c530 100644 --- a/assets/carrier_config_44020.xml +++ b/assets/carrier_config_44020.xml @@ -12,12 +12,6 @@ <int name="volte_replacement_rat_int" value="3" /> <int name="ims_dtmf_tone_delay_int" value="215" /> <boolean name="always_show_emergency_alert_onoff_bool" value="true" /> - <string-array name="carrier_additional_cbs_channels_strings" num="4"> - <item value="0xA800:type=earthquake, emergency=true" /> - <item value="0xAFEE:type=tsunami, emergency=true" /> - <item value="0xAC00-0xAFED:type=other, emergency=true" /> - <item value="0xA802,0xA804:type=etws_default, emergency=true" /> - </string-array> <string name="default_vm_number_string">1416</string> <long name="message_expiration_time_long" value="3600000" /> <boolean name="ignore_data_enabled_changed_for_video_calls" value="true" /> diff --git a/assets/carrier_config_44050.xml b/assets/carrier_config_44050.xml index 60bca17..3cbfc56 100644 --- a/assets/carrier_config_44050.xml +++ b/assets/carrier_config_44050.xml @@ -1,9 +1,6 @@ <?xml version='1.0' encoding='utf-8' standalone='yes' ?> <carrier_config_list> <carrier_config> - <string-array name="carrier_additional_cbs_channels_strings" num="1"> - <item value="0xA003:type=other, emergency=true" /> - </string-array> <boolean name="allow_emergency_numbers_in_call_log_bool" value="true" /> </carrier_config> </carrier_config_list> diff --git a/assets/carrier_config_44051.xml b/assets/carrier_config_44051.xml index 60bca17..3cbfc56 100644 --- a/assets/carrier_config_44051.xml +++ b/assets/carrier_config_44051.xml @@ -1,9 +1,6 @@ <?xml version='1.0' encoding='utf-8' standalone='yes' ?> <carrier_config_list> <carrier_config> - <string-array name="carrier_additional_cbs_channels_strings" num="1"> - <item value="0xA003:type=other, emergency=true" /> - </string-array> <boolean name="allow_emergency_numbers_in_call_log_bool" value="true" /> </carrier_config> </carrier_config_list> diff --git a/assets/carrier_config_44052.xml b/assets/carrier_config_44052.xml deleted file mode 100644 index 4c70408..0000000 --- a/assets/carrier_config_44052.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version='1.0' encoding='utf-8' standalone='yes' ?> -<carrier_config_list> - <carrier_config> - <string-array name="carrier_additional_cbs_channels_strings" num="1"> - <item value="0xA003:type=other, emergency=true" /> - </string-array> - </carrier_config> -</carrier_config_list> |