diff options
| author | Jack Yu <jackyu@google.com> | 2017-02-09 09:56:40 -0800 |
|---|---|---|
| committer | Jack Yu <jackyu@google.com> | 2017-02-09 09:56:43 -0800 |
| commit | 3fd14d9357c3b40f9375da2a3c44bd4245265970 (patch) | |
| tree | 193ab2f4f5adf0264626b5a381cd61789a86fe9d /assets/carrier_config_44010.xml | |
| parent | 9100660c38cab5a51162bb9fb13a11bd85ffd82e (diff) | |
| parent | 83de80998fbd9494bdd82689f9a715e744e2e0fc (diff) | |
| download | android_packages_apps_CarrierConfig-3fd14d9357c3b40f9375da2a3c44bd4245265970.tar.gz android_packages_apps_CarrierConfig-3fd14d9357c3b40f9375da2a3c44bd4245265970.tar.bz2 android_packages_apps_CarrierConfig-3fd14d9357c3b40f9375da2a3c44bd4245265970.zip | |
resolve merge conflicts of 83de809 to nyc-mr2-dev-plus-aosp
Test: unit test
Change-Id: Ifb866d6bb2bc0f84976c4132ac29e600c1e68073
Diffstat (limited to 'assets/carrier_config_44010.xml')
| -rw-r--r-- | assets/carrier_config_44010.xml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/assets/carrier_config_44010.xml b/assets/carrier_config_44010.xml index 8b48240..da66727 100644 --- a/assets/carrier_config_44010.xml +++ b/assets/carrier_config_44010.xml @@ -2,15 +2,16 @@ <carrier_config_list> <carrier_config> <boolean name="enabledMMS" value="false" /> -<boolean name="carrier_force_disable_etws_cmas_test_bool" value="true" /> +<boolean name="carrier_force_disable_etws_cmas_test_bool" value="false" /> <boolean name="carrier_volte_available_bool" value="true" /> <int name="volte_replacement_rat_int" value="3" /> <boolean name="hide_ims_apn_bool" value="true" /> <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="1"> - <item value="0xA000-0xA002,0xA004-0xA3FF:type=etws_default, emergency=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> </carrier_config> </carrier_config_list> |