diff options
| author | Jack Yu <jackyu@google.com> | 2017-01-24 11:04:14 -0800 |
|---|---|---|
| committer | Jack Yu <jackyu@google.com> | 2017-01-24 11:04:37 -0800 |
| commit | a25d91afeaf160ca165c735a1b01ce4d5690b9f1 (patch) | |
| tree | 4bb32c3efeaffc7b86d8d68259d5174ca0db6ba2 /assets/carrier_config_44010.xml | |
| parent | 5a9916bfd3c4c8234532b2d36dde8893bf96bb33 (diff) | |
| parent | e2f002c59a78591871452b9ebd1177e2c721fc85 (diff) | |
| download | android_packages_apps_CarrierConfig-a25d91afeaf160ca165c735a1b01ce4d5690b9f1.tar.gz android_packages_apps_CarrierConfig-a25d91afeaf160ca165c735a1b01ce4d5690b9f1.tar.bz2 android_packages_apps_CarrierConfig-a25d91afeaf160ca165c735a1b01ce4d5690b9f1.zip | |
resolve merge conflicts of e2f002c to nyc-mr2-dev-plus-aosp
Test: runtest carrierconfig-unit
Change-Id: Ia1e0213ee70fbde2e7a525f0646ebd0a6444418e
Diffstat (limited to 'assets/carrier_config_44010.xml')
| -rw-r--r-- | assets/carrier_config_44010.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/assets/carrier_config_44010.xml b/assets/carrier_config_44010.xml index 8936279..8b48240 100644 --- a/assets/carrier_config_44010.xml +++ b/assets/carrier_config_44010.xml @@ -9,5 +9,8 @@ <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> </carrier_config> </carrier_config_list> |