Fix cell broadcast settings for Japanese carriers
Omit cell broadcast channel ID 0xA000 to prevent duplicated message
reception with 0x1100/0x1101, and split item into 2 ranges to enable
parsing:
NTT DOCOMO/44010
Change each channel ID range type to other according to the network
configuration:
NTT DOCOMO/44010
KDDI/44050,44051,44052
Enable ETWS/CMAS test alert settings:
NTT DOCOMO/44010
KDDI/44050,44051,44052
SoftBank/44020
Test: BTS simulator test
Change-Id: I3234d9a7518cc4c9f627b2ad35c8c6e11cf5abc0
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>
diff --git a/assets/carrier_config_44020.xml b/assets/carrier_config_44020.xml
index 83f9175..20ccb06 100644
--- a/assets/carrier_config_44020.xml
+++ b/assets/carrier_config_44020.xml
@@ -7,7 +7,7 @@
<int name="maxMessageSize" value="307200" />
<int name="maxImageWidth" value="2592" />
<boolean name="enabledMMS" value="true" />
- <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" />
<int name="ims_dtmf_tone_delay_int" value="215" />
diff --git a/assets/carrier_config_44050.xml b/assets/carrier_config_44050.xml
index 0a9ba99..4c70408 100644
--- a/assets/carrier_config_44050.xml
+++ b/assets/carrier_config_44050.xml
@@ -2,7 +2,7 @@
<carrier_config_list>
<carrier_config>
<string-array name="carrier_additional_cbs_channels_strings" num="1">
- <item value="0xA003:type=etws_default, emergency=true" />
+ <item value="0xA003:type=other, emergency=true" />
</string-array>
</carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_44051.xml b/assets/carrier_config_44051.xml
index 0a9ba99..4c70408 100644
--- a/assets/carrier_config_44051.xml
+++ b/assets/carrier_config_44051.xml
@@ -2,7 +2,7 @@
<carrier_config_list>
<carrier_config>
<string-array name="carrier_additional_cbs_channels_strings" num="1">
- <item value="0xA003:type=etws_default, emergency=true" />
+ <item value="0xA003:type=other, emergency=true" />
</string-array>
</carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_44052.xml b/assets/carrier_config_44052.xml
index 0a9ba99..4c70408 100644
--- a/assets/carrier_config_44052.xml
+++ b/assets/carrier_config_44052.xml
@@ -2,7 +2,7 @@
<carrier_config_list>
<carrier_config>
<string-array name="carrier_additional_cbs_channels_strings" num="1">
- <item value="0xA003:type=etws_default, emergency=true" />
+ <item value="0xA003:type=other, emergency=true" />
</string-array>
</carrier_config>
</carrier_config_list>