summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README12
-rw-r--r--assets/carrier_config_20404.xml28
-rw-r--r--assets/carrier_config_20801.xml4
-rw-r--r--assets/carrier_config_20802.xml9
-rw-r--r--assets/carrier_config_23415.xml4
-rw-r--r--assets/carrier_config_310004.xml20
-rw-r--r--assets/carrier_config_310120.xml59
-rw-r--r--assets/carrier_config_311220.xml39
-rw-r--r--assets/carrier_config_311221.xml33
-rw-r--r--assets/carrier_config_311222.xml33
-rw-r--r--assets/carrier_config_311223.xml33
-rw-r--r--assets/carrier_config_311224.xml33
-rw-r--r--assets/carrier_config_311225.xml33
-rw-r--r--assets/carrier_config_311226.xml33
-rw-r--r--assets/carrier_config_311227.xml33
-rw-r--r--assets/carrier_config_311228.xml33
-rw-r--r--assets/carrier_config_311229.xml33
-rw-r--r--assets/carrier_config_311480.xml38
-rw-r--r--assets/carrier_config_311490.xml45
-rw-r--r--assets/carrier_config_311580.xml41
-rw-r--r--assets/carrier_config_311581.xml33
-rw-r--r--assets/carrier_config_311582.xml33
-rw-r--r--assets/carrier_config_311583.xml33
-rw-r--r--assets/carrier_config_311584.xml33
-rw-r--r--assets/carrier_config_311585.xml33
-rw-r--r--assets/carrier_config_311586.xml33
-rw-r--r--assets/carrier_config_311587.xml33
-rw-r--r--assets/carrier_config_311588.xml33
-rw-r--r--assets/carrier_config_311589.xml33
-rw-r--r--assets/carrier_config_311870.xml39
-rw-r--r--assets/carrier_config_312530.xml39
-rw-r--r--tests/Android.mk1
-rw-r--r--tests/AndroidTest.xml27
-rw-r--r--tests/src/com/android/carrierconfig/CarrierConfigTest.java8
34 files changed, 575 insertions, 432 deletions
diff --git a/README b/README
new file mode 100644
index 0000000..c6432f0
--- /dev/null
+++ b/README
@@ -0,0 +1,12 @@
+Default Carrier Config App
+==========================
+
+This app works as part of com.android.phone.CarrierConfigLoader to configure telephony features
+based on the subscriber's network. It replaced many XML resource overlays in frameworks/base and
+frameworks/opt/telephony. The current framework allows per-network configuration that uses
+CarrierIdentifier objects, rather than just mcc/mnc.
+
+This app uses a CarrierIdentifier to read the appropriate config snippets from the assets folder.
+
+If you make changes to the XML files, run the unit tests to ensure they can still be parsed:
+ runtest carrierconfig-unit \ No newline at end of file
diff --git a/assets/carrier_config_20404.xml b/assets/carrier_config_20404.xml
index 0c11e46..a5745b4 100644
--- a/assets/carrier_config_20404.xml
+++ b/assets/carrier_config_20404.xml
@@ -7,13 +7,36 @@
<string name="default_vm_number_string">+31654501233</string>
</carrier_config>
<carrier_config gid1="BAE0000000000000">
+ <boolean name="sms_requires_destination_number_conversion_bool" value="true" />
<boolean name="mdn_is_additional_voicemail_number_bool" value="true" />
<boolean name="allow_adding_apns_bool" value="false" />
<boolean name="broadcast_emergency_call_state_changes_bool" value="true" />
<string name="carrier_eri_file_name_string">eri_311480.xml</string>
<int name="carrier_default_wfc_ims_mode_int" value="1"/>
+ <string name="default_vm_number_string">*86</string>
+ <string-array name="dial_string_replace_string_array" num="2">
+ <item value="*611:+19085594899" />
+ <item value="*86:+1MDN" />
+ </string-array>
+ <string-array name="carrier_data_call_permanent_failure_strings" num="14">
+ <item value="OPERATOR_BARRED" />
+ <item value="MISSING_UNKNOWN_APN" />
+ <item value="UNKNOWN_PDP_ADDRESS_TYPE" />
+ <item value="USER_AUTHENTICATION" />
+ <item value="SERVICE_OPTION_NOT_SUPPORTED" />
+ <item value="SERVICE_OPTION_NOT_SUBSCRIBED" />
+ <item value="NSAPI_IN_USE" />
+ <item value="ONLY_IPV4_ALLOWED" />
+ <item value="ONLY_IPV6_ALLOWED" />
+ <item value="RADIO_POWER_OFF" />
+ <item value="TETHERED_CALL_ACTIVE" />
+ <item value="RADIO_NOT_AVAILABLE" />
+ <item value="UNACCEPTABLE_NETWORK_PARAMETER" />
+ <item value="SIGNAL_LOST" />
+ </string-array>
<boolean name="editable_wfc_mode_bool" value="false"/>
<boolean name="disable_severe_when_extreme_disabled_bool" value="false" />
+ <boolean name="persist_lpp_mode_bool" value="true" />
<int name="wfc_spn_format_idx_int" value="1" />
<string-array name="read_only_apn_fields_string_array" num="20">
<item value="name" />
@@ -47,11 +70,6 @@
<item value="dun" />
<item value="supl" />
</string-array>
- <string-array name="dial_string_replace_string_array" num="2">
- <item value="*611:+19085594899" />
- <item value="*86:+1MDN" />
- </string-array>
- <string name="default_vm_number_string">*86</string>
<boolean name="disable_voice_barring_notification_bool" value="true" />
</carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_20801.xml b/assets/carrier_config_20801.xml
index b80ef47..7fd4c25 100644
--- a/assets/carrier_config_20801.xml
+++ b/assets/carrier_config_20801.xml
@@ -4,5 +4,9 @@
<int name="maxImageHeight" value="1944" />
<int name="maxMessageSize" value="614400" />
<int name="maxImageWidth" value="2592" />
+<string-array name="carrier_vvm_package_name_string_array" num="1">
+<item value="com.orange.vvm"/>
+</string-array>
+<boolean name="allow_ussd_requests_via_telephony_manager_bool" value="false" />
</carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_20802.xml b/assets/carrier_config_20802.xml
new file mode 100644
index 0000000..252620e
--- /dev/null
+++ b/assets/carrier_config_20802.xml
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
+<carrier_config_list>
+<carrier_config>
+<string-array name="carrier_vvm_package_name_string_array" num="1">
+<item value="com.orange.vvm"/>
+</string-array>
+<boolean name="allow_ussd_requests_via_telephony_manager_bool" value="false" />
+</carrier_config>
+</carrier_config_list>
diff --git a/assets/carrier_config_23415.xml b/assets/carrier_config_23415.xml
index f9fe16e..badfc31 100644
--- a/assets/carrier_config_23415.xml
+++ b/assets/carrier_config_23415.xml
@@ -1,10 +1,10 @@
<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
<carrier_config_list>
<carrier_config>
+ <int name="smsToMmsTextThreshold" value="10" />
+ <string name="default_vm_number_string">121</string>
<string-array name="read_only_apn_types_string_array" num="1">
<item value="*" />
</string-array>
- <int name="smsToMmsTextThreshold" value="10" />
- <string name="default_vm_number_string">121</string>
</carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_310004.xml b/assets/carrier_config_310004.xml
index af1a9dd..9eaa84f 100644
--- a/assets/carrier_config_310004.xml
+++ b/assets/carrier_config_310004.xml
@@ -1,6 +1,7 @@
<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
<carrier_config_list>
<carrier_config>
+ <boolean name="sms_requires_destination_number_conversion_bool" value="true" />
<boolean name="mdn_is_additional_voicemail_number_bool" value="true" />
<boolean name="operator_selection_expand_bool" value="true" />
<int name="aliasMinChars" value="2" />
@@ -29,8 +30,26 @@
<boolean name="broadcast_emergency_call_state_changes_bool" value="true" />
<string name="carrier_eri_file_name_string">eri_311480.xml</string>
<int name="carrier_default_wfc_ims_mode_int" value="1"/>
+ <string name="default_vm_number_string">*86</string>
+ <string-array name="carrier_data_call_permanent_failure_strings" num="14">
+ <item value="OPERATOR_BARRED" />
+ <item value="MISSING_UNKNOWN_APN" />
+ <item value="UNKNOWN_PDP_ADDRESS_TYPE" />
+ <item value="USER_AUTHENTICATION" />
+ <item value="SERVICE_OPTION_NOT_SUPPORTED" />
+ <item value="SERVICE_OPTION_NOT_SUBSCRIBED" />
+ <item value="NSAPI_IN_USE" />
+ <item value="ONLY_IPV4_ALLOWED" />
+ <item value="ONLY_IPV6_ALLOWED" />
+ <item value="RADIO_POWER_OFF" />
+ <item value="TETHERED_CALL_ACTIVE" />
+ <item value="RADIO_NOT_AVAILABLE" />
+ <item value="UNACCEPTABLE_NETWORK_PARAMETER" />
+ <item value="SIGNAL_LOST" />
+ </string-array>
<boolean name="editable_wfc_mode_bool" value="false"/>
<boolean name="disable_severe_when_extreme_disabled_bool" value="false" />
+ <boolean name="persist_lpp_mode_bool" value="true" />
<boolean name="mmsCloseConnection" value="true"/>
<int name="wfc_spn_format_idx_int" value="1" />
<string-array name="read_only_apn_fields_string_array" num="20">
@@ -65,7 +84,6 @@
<item value="dun" />
<item value="supl" />
</string-array>
- <string name="default_vm_number_string">*86</string>
<boolean name="disable_voice_barring_notification_bool" value="true" />
</carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_310120.xml b/assets/carrier_config_310120.xml
index 941ff6d..e18d5c9 100644
--- a/assets/carrier_config_310120.xml
+++ b/assets/carrier_config_310120.xml
@@ -1,32 +1,33 @@
<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
<carrier_config_list>
-<carrier_config>
-<boolean name="dtmf_type_enabled_bool" value="true" />
-<int name="smsToMmsTextThreshold" value="6" />
-<boolean name="enableSMSDeliveryReports" value="false" />
-<int name="maxMessageTextSize" value="-1" />
-<boolean name="supportMmsContentDisposition" value="false" />
-<boolean name="voicemail_notification_persistent_bool" value="true" />
-<boolean name="support_swap_after_merge_bool" value="false" />
-<int name="recipientLimit" value="40" />
-<int name="maxImageHeight" value="1944" />
-<boolean name="enableMMSDeliveryReports" value="false" />
-<boolean name="apn_expand_bool" value="false" />
-<int name="maxSubjectLength" value="80" />
-<string name="httpParams">X-MDN: ##LINE1##|Proxy-Authorization: Basic ##NAI##</string>
-<boolean name="show_cdma_choices_bool" value="true" />
-<boolean name="carrier_settings_enable_bool" value="true" />
-<string name="emailGatewayNumber">6245</string>
-<boolean name="use_hfa_for_provisioning_bool" value="true" />
-<int name="maxMessageSize" value="1048576" />
-<string name="naiSuffix">:pcs</string>
-<boolean name="enableMMSReadReports" value="false" />
-<int name="maxImageWidth" value="2592" />
-<int name="volte_replacement_rat_int" value="6" />
-<boolean name="enabledMMS" value="true" />
-<boolean name="enableMultipartSMS" value="true" />
-<boolean name="allow_non_emergency_calls_in_ecm_bool" value="false" />
-<string name="carrier_eri_file_name_string">eri_310120.xml</string>
-<boolean name="stk_disable_launch_browser_bool" value="true" />
-</carrier_config>
+ <carrier_config>
+ <boolean name="dtmf_type_enabled_bool" value="true" />
+ <int name="smsToMmsTextThreshold" value="6" />
+ <boolean name="enableSMSDeliveryReports" value="false" />
+ <int name="maxMessageTextSize" value="-1" />
+ <boolean name="supportMmsContentDisposition" value="false" />
+ <boolean name="voicemail_notification_persistent_bool" value="true" />
+ <boolean name="support_swap_after_merge_bool" value="false" />
+ <int name="recipientLimit" value="40" />
+ <int name="maxImageHeight" value="1944" />
+ <boolean name="enableMMSDeliveryReports" value="false" />
+ <boolean name="apn_expand_bool" value="false" />
+ <int name="maxSubjectLength" value="80" />
+ <string name="httpParams">X-MDN: ##LINE1##|Proxy-Authorization: Basic ##NAI##</string>
+ <boolean name="show_cdma_choices_bool" value="true" />
+ <boolean name="carrier_settings_enable_bool" value="true" />
+ <string name="emailGatewayNumber">6245</string>
+ <boolean name="use_hfa_for_provisioning_bool" value="true" />
+ <int name="maxMessageSize" value="1048576" />
+ <string name="naiSuffix">:pcs</string>
+ <boolean name="enableMMSReadReports" value="false" />
+ <int name="maxImageWidth" value="2592" />
+ <int name="volte_replacement_rat_int" value="6" />
+ <int name="cdma_3waycall_flash_delay_int" value="300" />
+ <boolean name="enabledMMS" value="true" />
+ <boolean name="enableMultipartSMS" value="true" />
+ <boolean name="allow_non_emergency_calls_in_ecm_bool" value="false" />
+ <string name="carrier_eri_file_name_string">eri_310120.xml</string>
+ <boolean name="stk_disable_launch_browser_bool" value="true" />
+ </carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_311220.xml b/assets/carrier_config_311220.xml
index 611fbf2..77a7762 100644
--- a/assets/carrier_config_311220.xml
+++ b/assets/carrier_config_311220.xml
@@ -1,22 +1,23 @@
<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
<carrier_config_list>
-<carrier_config>
-<boolean name="dtmf_type_enabled_bool" value="true" />
-<boolean name="use_otasp_for_provisioning_bool" value="true" />
-<boolean name="enabledTransID" value="true" />
-<boolean name="allowAttachAudio" value="true" />
-<int name="recipientLimit" value="20" />
-<string name="uaProfTagName">x-wap-profile</string>
-<int name="maxImageHeight" value="1944" />
-<int name="maxSubjectLength" value="80" />
-<string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
-<boolean name="show_cdma_choices_bool" value="true" />
-<string name="emailGatewayNumber">6245</string>
-<int name="maxMessageSize" value="1048576" />
-<boolean name="enableMMSReadReports" value="false" />
-<int name="maxImageWidth" value="2592" />
-<boolean name="enabledNotifyWapMMSC" value="true" />
-<boolean name="enableMultipartSMS" value="false" />
-<boolean name="show_apn_setting_cdma_bool" value="true" />
-</carrier_config>
+ <carrier_config>
+ <boolean name="dtmf_type_enabled_bool" value="true" />
+ <boolean name="use_otasp_for_provisioning_bool" value="true" />
+ <boolean name="enabledTransID" value="true" />
+ <boolean name="allowAttachAudio" value="true" />
+ <int name="recipientLimit" value="20" />
+ <string name="uaProfTagName">x-wap-profile</string>
+ <int name="maxImageHeight" value="1944" />
+ <int name="maxSubjectLength" value="80" />
+ <string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
+ <boolean name="show_cdma_choices_bool" value="true" />
+ <string name="emailGatewayNumber">6245</string>
+ <int name="cdma_3waycall_flash_delay_int" value="300" />
+ <int name="maxMessageSize" value="1048576" />
+ <boolean name="enableMMSReadReports" value="false" />
+ <int name="maxImageWidth" value="2592" />
+ <boolean name="enabledNotifyWapMMSC" value="true" />
+ <boolean name="enableMultipartSMS" value="false" />
+ <boolean name="show_apn_setting_cdma_bool" value="true" />
+ </carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_311221.xml b/assets/carrier_config_311221.xml
index 049c65a..5f9058e 100644
--- a/assets/carrier_config_311221.xml
+++ b/assets/carrier_config_311221.xml
@@ -1,19 +1,20 @@
<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
<carrier_config_list>
-<carrier_config>
-<boolean name="enabledTransID" value="true" />
-<boolean name="allowAttachAudio" value="true" />
-<int name="recipientLimit" value="20" />
-<string name="uaProfTagName">x-wap-profile</string>
-<int name="maxImageHeight" value="1944" />
-<int name="maxSubjectLength" value="80" />
-<string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
-<boolean name="show_cdma_choices_bool" value="true" />
-<string name="emailGatewayNumber">6245</string>
-<int name="maxMessageSize" value="1048576" />
-<boolean name="enableMMSReadReports" value="false" />
-<int name="maxImageWidth" value="2592" />
-<boolean name="enabledNotifyWapMMSC" value="true" />
-<boolean name="enableMultipartSMS" value="false" />
-</carrier_config>
+ <carrier_config>
+ <boolean name="enabledTransID" value="true" />
+ <boolean name="allowAttachAudio" value="true" />
+ <int name="recipientLimit" value="20" />
+ <string name="uaProfTagName">x-wap-profile</string>
+ <int name="maxImageHeight" value="1944" />
+ <int name="maxSubjectLength" value="80" />
+ <string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
+ <boolean name="show_cdma_choices_bool" value="true" />
+ <string name="emailGatewayNumber">6245</string>
+ <int name="cdma_3waycall_flash_delay_int" value="300" />
+ <int name="maxMessageSize" value="1048576" />
+ <boolean name="enableMMSReadReports" value="false" />
+ <int name="maxImageWidth" value="2592" />
+ <boolean name="enabledNotifyWapMMSC" value="true" />
+ <boolean name="enableMultipartSMS" value="false" />
+ </carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_311222.xml b/assets/carrier_config_311222.xml
index 049c65a..5f9058e 100644
--- a/assets/carrier_config_311222.xml
+++ b/assets/carrier_config_311222.xml
@@ -1,19 +1,20 @@
<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
<carrier_config_list>
-<carrier_config>
-<boolean name="enabledTransID" value="true" />
-<boolean name="allowAttachAudio" value="true" />
-<int name="recipientLimit" value="20" />
-<string name="uaProfTagName">x-wap-profile</string>
-<int name="maxImageHeight" value="1944" />
-<int name="maxSubjectLength" value="80" />
-<string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
-<boolean name="show_cdma_choices_bool" value="true" />
-<string name="emailGatewayNumber">6245</string>
-<int name="maxMessageSize" value="1048576" />
-<boolean name="enableMMSReadReports" value="false" />
-<int name="maxImageWidth" value="2592" />
-<boolean name="enabledNotifyWapMMSC" value="true" />
-<boolean name="enableMultipartSMS" value="false" />
-</carrier_config>
+ <carrier_config>
+ <boolean name="enabledTransID" value="true" />
+ <boolean name="allowAttachAudio" value="true" />
+ <int name="recipientLimit" value="20" />
+ <string name="uaProfTagName">x-wap-profile</string>
+ <int name="maxImageHeight" value="1944" />
+ <int name="maxSubjectLength" value="80" />
+ <string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
+ <boolean name="show_cdma_choices_bool" value="true" />
+ <string name="emailGatewayNumber">6245</string>
+ <int name="cdma_3waycall_flash_delay_int" value="300" />
+ <int name="maxMessageSize" value="1048576" />
+ <boolean name="enableMMSReadReports" value="false" />
+ <int name="maxImageWidth" value="2592" />
+ <boolean name="enabledNotifyWapMMSC" value="true" />
+ <boolean name="enableMultipartSMS" value="false" />
+ </carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_311223.xml b/assets/carrier_config_311223.xml
index 049c65a..5f9058e 100644
--- a/assets/carrier_config_311223.xml
+++ b/assets/carrier_config_311223.xml
@@ -1,19 +1,20 @@
<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
<carrier_config_list>
-<carrier_config>
-<boolean name="enabledTransID" value="true" />
-<boolean name="allowAttachAudio" value="true" />
-<int name="recipientLimit" value="20" />
-<string name="uaProfTagName">x-wap-profile</string>
-<int name="maxImageHeight" value="1944" />
-<int name="maxSubjectLength" value="80" />
-<string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
-<boolean name="show_cdma_choices_bool" value="true" />
-<string name="emailGatewayNumber">6245</string>
-<int name="maxMessageSize" value="1048576" />
-<boolean name="enableMMSReadReports" value="false" />
-<int name="maxImageWidth" value="2592" />
-<boolean name="enabledNotifyWapMMSC" value="true" />
-<boolean name="enableMultipartSMS" value="false" />
-</carrier_config>
+ <carrier_config>
+ <boolean name="enabledTransID" value="true" />
+ <boolean name="allowAttachAudio" value="true" />
+ <int name="recipientLimit" value="20" />
+ <string name="uaProfTagName">x-wap-profile</string>
+ <int name="maxImageHeight" value="1944" />
+ <int name="maxSubjectLength" value="80" />
+ <string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
+ <boolean name="show_cdma_choices_bool" value="true" />
+ <string name="emailGatewayNumber">6245</string>
+ <int name="cdma_3waycall_flash_delay_int" value="300" />
+ <int name="maxMessageSize" value="1048576" />
+ <boolean name="enableMMSReadReports" value="false" />
+ <int name="maxImageWidth" value="2592" />
+ <boolean name="enabledNotifyWapMMSC" value="true" />
+ <boolean name="enableMultipartSMS" value="false" />
+ </carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_311224.xml b/assets/carrier_config_311224.xml
index 049c65a..5f9058e 100644
--- a/assets/carrier_config_311224.xml
+++ b/assets/carrier_config_311224.xml
@@ -1,19 +1,20 @@
<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
<carrier_config_list>
-<carrier_config>
-<boolean name="enabledTransID" value="true" />
-<boolean name="allowAttachAudio" value="true" />
-<int name="recipientLimit" value="20" />
-<string name="uaProfTagName">x-wap-profile</string>
-<int name="maxImageHeight" value="1944" />
-<int name="maxSubjectLength" value="80" />
-<string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
-<boolean name="show_cdma_choices_bool" value="true" />
-<string name="emailGatewayNumber">6245</string>
-<int name="maxMessageSize" value="1048576" />
-<boolean name="enableMMSReadReports" value="false" />
-<int name="maxImageWidth" value="2592" />
-<boolean name="enabledNotifyWapMMSC" value="true" />
-<boolean name="enableMultipartSMS" value="false" />
-</carrier_config>
+ <carrier_config>
+ <boolean name="enabledTransID" value="true" />
+ <boolean name="allowAttachAudio" value="true" />
+ <int name="recipientLimit" value="20" />
+ <string name="uaProfTagName">x-wap-profile</string>
+ <int name="maxImageHeight" value="1944" />
+ <int name="maxSubjectLength" value="80" />
+ <string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
+ <boolean name="show_cdma_choices_bool" value="true" />
+ <string name="emailGatewayNumber">6245</string>
+ <int name="cdma_3waycall_flash_delay_int" value="300" />
+ <int name="maxMessageSize" value="1048576" />
+ <boolean name="enableMMSReadReports" value="false" />
+ <int name="maxImageWidth" value="2592" />
+ <boolean name="enabledNotifyWapMMSC" value="true" />
+ <boolean name="enableMultipartSMS" value="false" />
+ </carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_311225.xml b/assets/carrier_config_311225.xml
index 049c65a..5f9058e 100644
--- a/assets/carrier_config_311225.xml
+++ b/assets/carrier_config_311225.xml
@@ -1,19 +1,20 @@
<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
<carrier_config_list>
-<carrier_config>
-<boolean name="enabledTransID" value="true" />
-<boolean name="allowAttachAudio" value="true" />
-<int name="recipientLimit" value="20" />
-<string name="uaProfTagName">x-wap-profile</string>
-<int name="maxImageHeight" value="1944" />
-<int name="maxSubjectLength" value="80" />
-<string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
-<boolean name="show_cdma_choices_bool" value="true" />
-<string name="emailGatewayNumber">6245</string>
-<int name="maxMessageSize" value="1048576" />
-<boolean name="enableMMSReadReports" value="false" />
-<int name="maxImageWidth" value="2592" />
-<boolean name="enabledNotifyWapMMSC" value="true" />
-<boolean name="enableMultipartSMS" value="false" />
-</carrier_config>
+ <carrier_config>
+ <boolean name="enabledTransID" value="true" />
+ <boolean name="allowAttachAudio" value="true" />
+ <int name="recipientLimit" value="20" />
+ <string name="uaProfTagName">x-wap-profile</string>
+ <int name="maxImageHeight" value="1944" />
+ <int name="maxSubjectLength" value="80" />
+ <string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
+ <boolean name="show_cdma_choices_bool" value="true" />
+ <string name="emailGatewayNumber">6245</string>
+ <int name="cdma_3waycall_flash_delay_int" value="300" />
+ <int name="maxMessageSize" value="1048576" />
+ <boolean name="enableMMSReadReports" value="false" />
+ <int name="maxImageWidth" value="2592" />
+ <boolean name="enabledNotifyWapMMSC" value="true" />
+ <boolean name="enableMultipartSMS" value="false" />
+ </carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_311226.xml b/assets/carrier_config_311226.xml
index 049c65a..5f9058e 100644
--- a/assets/carrier_config_311226.xml
+++ b/assets/carrier_config_311226.xml
@@ -1,19 +1,20 @@
<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
<carrier_config_list>
-<carrier_config>
-<boolean name="enabledTransID" value="true" />
-<boolean name="allowAttachAudio" value="true" />
-<int name="recipientLimit" value="20" />
-<string name="uaProfTagName">x-wap-profile</string>
-<int name="maxImageHeight" value="1944" />
-<int name="maxSubjectLength" value="80" />
-<string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
-<boolean name="show_cdma_choices_bool" value="true" />
-<string name="emailGatewayNumber">6245</string>
-<int name="maxMessageSize" value="1048576" />
-<boolean name="enableMMSReadReports" value="false" />
-<int name="maxImageWidth" value="2592" />
-<boolean name="enabledNotifyWapMMSC" value="true" />
-<boolean name="enableMultipartSMS" value="false" />
-</carrier_config>
+ <carrier_config>
+ <boolean name="enabledTransID" value="true" />
+ <boolean name="allowAttachAudio" value="true" />
+ <int name="recipientLimit" value="20" />
+ <string name="uaProfTagName">x-wap-profile</string>
+ <int name="maxImageHeight" value="1944" />
+ <int name="maxSubjectLength" value="80" />
+ <string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
+ <boolean name="show_cdma_choices_bool" value="true" />
+ <string name="emailGatewayNumber">6245</string>
+ <int name="cdma_3waycall_flash_delay_int" value="300" />
+ <int name="maxMessageSize" value="1048576" />
+ <boolean name="enableMMSReadReports" value="false" />
+ <int name="maxImageWidth" value="2592" />
+ <boolean name="enabledNotifyWapMMSC" value="true" />
+ <boolean name="enableMultipartSMS" value="false" />
+ </carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_311227.xml b/assets/carrier_config_311227.xml
index 049c65a..5f9058e 100644
--- a/assets/carrier_config_311227.xml
+++ b/assets/carrier_config_311227.xml
@@ -1,19 +1,20 @@
<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
<carrier_config_list>
-<carrier_config>
-<boolean name="enabledTransID" value="true" />
-<boolean name="allowAttachAudio" value="true" />
-<int name="recipientLimit" value="20" />
-<string name="uaProfTagName">x-wap-profile</string>
-<int name="maxImageHeight" value="1944" />
-<int name="maxSubjectLength" value="80" />
-<string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
-<boolean name="show_cdma_choices_bool" value="true" />
-<string name="emailGatewayNumber">6245</string>
-<int name="maxMessageSize" value="1048576" />
-<boolean name="enableMMSReadReports" value="false" />
-<int name="maxImageWidth" value="2592" />
-<boolean name="enabledNotifyWapMMSC" value="true" />
-<boolean name="enableMultipartSMS" value="false" />
-</carrier_config>
+ <carrier_config>
+ <boolean name="enabledTransID" value="true" />
+ <boolean name="allowAttachAudio" value="true" />
+ <int name="recipientLimit" value="20" />
+ <string name="uaProfTagName">x-wap-profile</string>
+ <int name="maxImageHeight" value="1944" />
+ <int name="maxSubjectLength" value="80" />
+ <string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
+ <boolean name="show_cdma_choices_bool" value="true" />
+ <string name="emailGatewayNumber">6245</string>
+ <int name="cdma_3waycall_flash_delay_int" value="300" />
+ <int name="maxMessageSize" value="1048576" />
+ <boolean name="enableMMSReadReports" value="false" />
+ <int name="maxImageWidth" value="2592" />
+ <boolean name="enabledNotifyWapMMSC" value="true" />
+ <boolean name="enableMultipartSMS" value="false" />
+ </carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_311228.xml b/assets/carrier_config_311228.xml
index 049c65a..5f9058e 100644
--- a/assets/carrier_config_311228.xml
+++ b/assets/carrier_config_311228.xml
@@ -1,19 +1,20 @@
<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
<carrier_config_list>
-<carrier_config>
-<boolean name="enabledTransID" value="true" />
-<boolean name="allowAttachAudio" value="true" />
-<int name="recipientLimit" value="20" />
-<string name="uaProfTagName">x-wap-profile</string>
-<int name="maxImageHeight" value="1944" />
-<int name="maxSubjectLength" value="80" />
-<string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
-<boolean name="show_cdma_choices_bool" value="true" />
-<string name="emailGatewayNumber">6245</string>
-<int name="maxMessageSize" value="1048576" />
-<boolean name="enableMMSReadReports" value="false" />
-<int name="maxImageWidth" value="2592" />
-<boolean name="enabledNotifyWapMMSC" value="true" />
-<boolean name="enableMultipartSMS" value="false" />
-</carrier_config>
+ <carrier_config>
+ <boolean name="enabledTransID" value="true" />
+ <boolean name="allowAttachAudio" value="true" />
+ <int name="recipientLimit" value="20" />
+ <string name="uaProfTagName">x-wap-profile</string>
+ <int name="maxImageHeight" value="1944" />
+ <int name="maxSubjectLength" value="80" />
+ <string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
+ <boolean name="show_cdma_choices_bool" value="true" />
+ <string name="emailGatewayNumber">6245</string>
+ <int name="cdma_3waycall_flash_delay_int" value="300" />
+ <int name="maxMessageSize" value="1048576" />
+ <boolean name="enableMMSReadReports" value="false" />
+ <int name="maxImageWidth" value="2592" />
+ <boolean name="enabledNotifyWapMMSC" value="true" />
+ <boolean name="enableMultipartSMS" value="false" />
+ </carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_311229.xml b/assets/carrier_config_311229.xml
index 049c65a..5f9058e 100644
--- a/assets/carrier_config_311229.xml
+++ b/assets/carrier_config_311229.xml
@@ -1,19 +1,20 @@
<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
<carrier_config_list>
-<carrier_config>
-<boolean name="enabledTransID" value="true" />
-<boolean name="allowAttachAudio" value="true" />
-<int name="recipientLimit" value="20" />
-<string name="uaProfTagName">x-wap-profile</string>
-<int name="maxImageHeight" value="1944" />
-<int name="maxSubjectLength" value="80" />
-<string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
-<boolean name="show_cdma_choices_bool" value="true" />
-<string name="emailGatewayNumber">6245</string>
-<int name="maxMessageSize" value="1048576" />
-<boolean name="enableMMSReadReports" value="false" />
-<int name="maxImageWidth" value="2592" />
-<boolean name="enabledNotifyWapMMSC" value="true" />
-<boolean name="enableMultipartSMS" value="false" />
-</carrier_config>
+ <carrier_config>
+ <boolean name="enabledTransID" value="true" />
+ <boolean name="allowAttachAudio" value="true" />
+ <int name="recipientLimit" value="20" />
+ <string name="uaProfTagName">x-wap-profile</string>
+ <int name="maxImageHeight" value="1944" />
+ <int name="maxSubjectLength" value="80" />
+ <string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
+ <boolean name="show_cdma_choices_bool" value="true" />
+ <string name="emailGatewayNumber">6245</string>
+ <int name="cdma_3waycall_flash_delay_int" value="300" />
+ <int name="maxMessageSize" value="1048576" />
+ <boolean name="enableMMSReadReports" value="false" />
+ <int name="maxImageWidth" value="2592" />
+ <boolean name="enabledNotifyWapMMSC" value="true" />
+ <boolean name="enableMultipartSMS" value="false" />
+ </carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_311480.xml b/assets/carrier_config_311480.xml
index faedf4d..e5a92f9 100644
--- a/assets/carrier_config_311480.xml
+++ b/assets/carrier_config_311480.xml
@@ -1,14 +1,17 @@
<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
<carrier_config_list>
<carrier_config>
+ <boolean name="carrier_volte_provisioned_bool" value="true" />
<boolean name="allow_hold_in_ims_call" value="false" />
+ <boolean name="sms_requires_destination_number_conversion_bool" value="true" />
<boolean name="mdn_is_additional_voicemail_number_bool" value="true" />
- <boolean name="carrier_volte_provisioned_bool" value="true" />
<boolean name="carrier_vt_available_bool" value="true" />
<boolean name="support_downgrade_vt_to_audio_bool" value="false" />
<boolean name="notify_handover_video_from_wifi_to_lte_bool" value="true" />
<boolean name="carrier_allow_turnoff_ims_bool" value="false" />
<boolean name="carrier_volte_provisioning_required_bool" value="true" />
+ <boolean name="treat_downgraded_video_calls_as_video_calls_bool" value="true" />
+ <boolean name="drop_video_call_when_answering_audio_call_bool" value="true" />
<boolean name="operator_selection_expand_bool" value="true" />
<int name="aliasMinChars" value="2" />
<boolean name="dtmf_type_enabled_bool" value="true" />
@@ -50,6 +53,28 @@
<boolean name="wifi_calls_can_be_hd_audio" value="false" />
<boolean name="video_calls_can_be_hd_audio" value="false" />
<boolean name="allow_add_call_during_video_call" value="false" />
+ <boolean name="persist_lpp_mode_bool" value="true" />
+ <string name="default_vm_number_string">*86</string>
+ <string-array name="dial_string_replace_string_array" num="2">
+ <item value="*611:+19085594899" />
+ <item value="*86:+1MDN" />
+ </string-array>
+ <string-array name="carrier_data_call_permanent_failure_strings" num="14">
+ <item value="OPERATOR_BARRED" />
+ <item value="MISSING_UNKNOWN_APN" />
+ <item value="UNKNOWN_PDP_ADDRESS_TYPE" />
+ <item value="USER_AUTHENTICATION" />
+ <item value="SERVICE_OPTION_NOT_SUPPORTED" />
+ <item value="SERVICE_OPTION_NOT_SUBSCRIBED" />
+ <item value="NSAPI_IN_USE" />
+ <item value="ONLY_IPV4_ALLOWED" />
+ <item value="ONLY_IPV6_ALLOWED" />
+ <item value="RADIO_POWER_OFF" />
+ <item value="TETHERED_CALL_ACTIVE" />
+ <item value="RADIO_NOT_AVAILABLE" />
+ <item value="UNACCEPTABLE_NETWORK_PARAMETER" />
+ <item value="SIGNAL_LOST" />
+ </string-array>
<boolean name="carrier_promote_wfc_on_call_fail_bool" value="true" />
<string-array name="ims_reasoninfo_mapping_string_array" num="10">
<item value="332|simultaneous call limit has already been reached|1403" />
@@ -103,11 +128,8 @@
<item value="dun" />
<item value="supl" />
</string-array>
- <string-array name="dial_string_replace_string_array" num="2">
- <item value="*611:+19085594899" />
- <item value="*86:+1MDN" />
- </string-array>
- <string name="default_vm_number_string">*86</string>
+ <boolean name="is_ims_conference_size_enforced_bool" value="true"/>
+ <int name="ims_conference_size_limit_int" value="5" />
<boolean name="support_3gpp_call_forwarding_while_roaming_bool" value="false" />
<string-array name="call_forwarding_blocks_while_roaming_string_array" num="2">
<item value="*71" />
@@ -115,4 +137,8 @@
</string-array>
<boolean name="disable_voice_barring_notification_bool" value="true" />
</carrier_config>
+ <!-- Tracfone Vzw shows empty string as SPN -->
+ <carrier_config gid1="BA01270000000000">
+ <boolean name="carrier_name_override_bool" value="true" />
+ </carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_311490.xml b/assets/carrier_config_311490.xml
index eefd4eb..16fe286 100644
--- a/assets/carrier_config_311490.xml
+++ b/assets/carrier_config_311490.xml
@@ -1,25 +1,26 @@
<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
<carrier_config_list>
-<carrier_config>
-<boolean name="dtmf_type_enabled_bool" value="true" />
-<int name="smsToMmsTextThreshold" value="6" />
-<boolean name="enableSMSDeliveryReports" value="false" />
-<int name="maxMessageTextSize" value="-1" />
-<boolean name="supportMmsContentDisposition" value="false" />
-<boolean name="voicemail_notification_persistent_bool" value="true" />
-<int name="recipientLimit" value="40" />
-<int name="maxImageHeight" value="1944" />
-<boolean name="enableMMSDeliveryReports" value="false" />
-<int name="maxSubjectLength" value="80" />
-<string name="httpParams">X-MDN: ##LINE1##|Proxy-Authorization: Basic ##NAI##</string>
-<string name="emailGatewayNumber">6245</string>
-<int name="maxMessageSize" value="1048576" />
-<string name="naiSuffix">:pcs</string>
-<boolean name="enableMMSReadReports" value="false" />
-<int name="maxImageWidth" value="2592" />
-<boolean name="enabledMMS" value="true" />
-<boolean name="enableMultipartSMS" value="true" />
-<boolean name="allow_non_emergency_calls_in_ecm_bool" value="false" />
-<string name="carrier_eri_file_name_string">eri_311490.xml</string>
-</carrier_config>
+ <carrier_config>
+ <boolean name="dtmf_type_enabled_bool" value="true" />
+ <int name="smsToMmsTextThreshold" value="6" />
+ <boolean name="enableSMSDeliveryReports" value="false" />
+ <int name="maxMessageTextSize" value="-1" />
+ <boolean name="supportMmsContentDisposition" value="false" />
+ <boolean name="voicemail_notification_persistent_bool" value="true" />
+ <int name="recipientLimit" value="40" />
+ <int name="maxImageHeight" value="1944" />
+ <boolean name="enableMMSDeliveryReports" value="false" />
+ <int name="maxSubjectLength" value="80" />
+ <string name="httpParams">X-MDN: ##LINE1##|Proxy-Authorization: Basic ##NAI##</string>
+ <string name="emailGatewayNumber">6245</string>
+ <int name="maxMessageSize" value="1048576" />
+ <string name="naiSuffix">:pcs</string>
+ <boolean name="enableMMSReadReports" value="false" />
+ <int name="cdma_3waycall_flash_delay_int" value="300" />
+ <int name="maxImageWidth" value="2592" />
+ <boolean name="enabledMMS" value="true" />
+ <boolean name="enableMultipartSMS" value="true" />
+ <boolean name="allow_non_emergency_calls_in_ecm_bool" value="false" />
+ <string name="carrier_eri_file_name_string">eri_311490.xml</string>
+ </carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_311580.xml b/assets/carrier_config_311580.xml
index 0416ec7..13c271e 100644
--- a/assets/carrier_config_311580.xml
+++ b/assets/carrier_config_311580.xml
@@ -1,23 +1,24 @@
<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
<carrier_config_list>
-<carrier_config>
-<boolean name="dtmf_type_enabled_bool" value="true" />
-<boolean name="use_otasp_for_provisioning_bool" value="true" />
-<boolean name="enabledTransID" value="true" />
-<boolean name="allowAttachAudio" value="true" />
-<int name="recipientLimit" value="20" />
-<string name="uaProfTagName">x-wap-profile</string>
-<int name="maxImageHeight" value="1944" />
-<int name="maxSubjectLength" value="80" />
-<string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
-<boolean name="show_cdma_choices_bool" value="true" />
-<string name="emailGatewayNumber">6245</string>
-<int name="maxMessageSize" value="1048576" />
-<boolean name="enableMMSReadReports" value="false" />
-<int name="maxImageWidth" value="2592" />
-<boolean name="enabledNotifyWapMMSC" value="true" />
-<boolean name="enableMultipartSMS" value="false" />
-<boolean name="show_apn_setting_cdma_bool" value="true" />
-<boolean name="support_swap_after_merge_bool" value="false" />
-</carrier_config>
+ <carrier_config>
+ <boolean name="dtmf_type_enabled_bool" value="true" />
+ <boolean name="use_otasp_for_provisioning_bool" value="true" />
+ <boolean name="enabledTransID" value="true" />
+ <boolean name="allowAttachAudio" value="true" />
+ <int name="recipientLimit" value="20" />
+ <string name="uaProfTagName">x-wap-profile</string>
+ <int name="maxImageHeight" value="1944" />
+ <int name="maxSubjectLength" value="80" />
+ <string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
+ <boolean name="show_cdma_choices_bool" value="true" />
+ <string name="emailGatewayNumber">6245</string>
+ <int name="cdma_3waycall_flash_delay_int" value="300" />
+ <int name="maxMessageSize" value="1048576" />
+ <boolean name="enableMMSReadReports" value="false" />
+ <int name="maxImageWidth" value="2592" />
+ <boolean name="enabledNotifyWapMMSC" value="true" />
+ <boolean name="enableMultipartSMS" value="false" />
+ <boolean name="show_apn_setting_cdma_bool" value="true" />
+ <boolean name="support_swap_after_merge_bool" value="false" />
+ </carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_311581.xml b/assets/carrier_config_311581.xml
index 049c65a..5f9058e 100644
--- a/assets/carrier_config_311581.xml
+++ b/assets/carrier_config_311581.xml
@@ -1,19 +1,20 @@
<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
<carrier_config_list>
-<carrier_config>
-<boolean name="enabledTransID" value="true" />
-<boolean name="allowAttachAudio" value="true" />
-<int name="recipientLimit" value="20" />
-<string name="uaProfTagName">x-wap-profile</string>
-<int name="maxImageHeight" value="1944" />
-<int name="maxSubjectLength" value="80" />
-<string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
-<boolean name="show_cdma_choices_bool" value="true" />
-<string name="emailGatewayNumber">6245</string>
-<int name="maxMessageSize" value="1048576" />
-<boolean name="enableMMSReadReports" value="false" />
-<int name="maxImageWidth" value="2592" />
-<boolean name="enabledNotifyWapMMSC" value="true" />
-<boolean name="enableMultipartSMS" value="false" />
-</carrier_config>
+ <carrier_config>
+ <boolean name="enabledTransID" value="true" />
+ <boolean name="allowAttachAudio" value="true" />
+ <int name="recipientLimit" value="20" />
+ <string name="uaProfTagName">x-wap-profile</string>
+ <int name="maxImageHeight" value="1944" />
+ <int name="maxSubjectLength" value="80" />
+ <string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
+ <boolean name="show_cdma_choices_bool" value="true" />
+ <string name="emailGatewayNumber">6245</string>
+ <int name="cdma_3waycall_flash_delay_int" value="300" />
+ <int name="maxMessageSize" value="1048576" />
+ <boolean name="enableMMSReadReports" value="false" />
+ <int name="maxImageWidth" value="2592" />
+ <boolean name="enabledNotifyWapMMSC" value="true" />
+ <boolean name="enableMultipartSMS" value="false" />
+ </carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_311582.xml b/assets/carrier_config_311582.xml
index 049c65a..5f9058e 100644
--- a/assets/carrier_config_311582.xml
+++ b/assets/carrier_config_311582.xml
@@ -1,19 +1,20 @@
<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
<carrier_config_list>
-<carrier_config>
-<boolean name="enabledTransID" value="true" />
-<boolean name="allowAttachAudio" value="true" />
-<int name="recipientLimit" value="20" />
-<string name="uaProfTagName">x-wap-profile</string>
-<int name="maxImageHeight" value="1944" />
-<int name="maxSubjectLength" value="80" />
-<string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
-<boolean name="show_cdma_choices_bool" value="true" />
-<string name="emailGatewayNumber">6245</string>
-<int name="maxMessageSize" value="1048576" />
-<boolean name="enableMMSReadReports" value="false" />
-<int name="maxImageWidth" value="2592" />
-<boolean name="enabledNotifyWapMMSC" value="true" />
-<boolean name="enableMultipartSMS" value="false" />
-</carrier_config>
+ <carrier_config>
+ <boolean name="enabledTransID" value="true" />
+ <boolean name="allowAttachAudio" value="true" />
+ <int name="recipientLimit" value="20" />
+ <string name="uaProfTagName">x-wap-profile</string>
+ <int name="maxImageHeight" value="1944" />
+ <int name="maxSubjectLength" value="80" />
+ <string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
+ <boolean name="show_cdma_choices_bool" value="true" />
+ <string name="emailGatewayNumber">6245</string>
+ <int name="cdma_3waycall_flash_delay_int" value="300" />
+ <int name="maxMessageSize" value="1048576" />
+ <boolean name="enableMMSReadReports" value="false" />
+ <int name="maxImageWidth" value="2592" />
+ <boolean name="enabledNotifyWapMMSC" value="true" />
+ <boolean name="enableMultipartSMS" value="false" />
+ </carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_311583.xml b/assets/carrier_config_311583.xml
index 049c65a..5f9058e 100644
--- a/assets/carrier_config_311583.xml
+++ b/assets/carrier_config_311583.xml
@@ -1,19 +1,20 @@
<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
<carrier_config_list>
-<carrier_config>
-<boolean name="enabledTransID" value="true" />
-<boolean name="allowAttachAudio" value="true" />
-<int name="recipientLimit" value="20" />
-<string name="uaProfTagName">x-wap-profile</string>
-<int name="maxImageHeight" value="1944" />
-<int name="maxSubjectLength" value="80" />
-<string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
-<boolean name="show_cdma_choices_bool" value="true" />
-<string name="emailGatewayNumber">6245</string>
-<int name="maxMessageSize" value="1048576" />
-<boolean name="enableMMSReadReports" value="false" />
-<int name="maxImageWidth" value="2592" />
-<boolean name="enabledNotifyWapMMSC" value="true" />
-<boolean name="enableMultipartSMS" value="false" />
-</carrier_config>
+ <carrier_config>
+ <boolean name="enabledTransID" value="true" />
+ <boolean name="allowAttachAudio" value="true" />
+ <int name="recipientLimit" value="20" />
+ <string name="uaProfTagName">x-wap-profile</string>
+ <int name="maxImageHeight" value="1944" />
+ <int name="maxSubjectLength" value="80" />
+ <string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
+ <boolean name="show_cdma_choices_bool" value="true" />
+ <string name="emailGatewayNumber">6245</string>
+ <int name="cdma_3waycall_flash_delay_int" value="300" />
+ <int name="maxMessageSize" value="1048576" />
+ <boolean name="enableMMSReadReports" value="false" />
+ <int name="maxImageWidth" value="2592" />
+ <boolean name="enabledNotifyWapMMSC" value="true" />
+ <boolean name="enableMultipartSMS" value="false" />
+ </carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_311584.xml b/assets/carrier_config_311584.xml
index 049c65a..5f9058e 100644
--- a/assets/carrier_config_311584.xml
+++ b/assets/carrier_config_311584.xml
@@ -1,19 +1,20 @@
<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
<carrier_config_list>
-<carrier_config>
-<boolean name="enabledTransID" value="true" />
-<boolean name="allowAttachAudio" value="true" />
-<int name="recipientLimit" value="20" />
-<string name="uaProfTagName">x-wap-profile</string>
-<int name="maxImageHeight" value="1944" />
-<int name="maxSubjectLength" value="80" />
-<string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
-<boolean name="show_cdma_choices_bool" value="true" />
-<string name="emailGatewayNumber">6245</string>
-<int name="maxMessageSize" value="1048576" />
-<boolean name="enableMMSReadReports" value="false" />
-<int name="maxImageWidth" value="2592" />
-<boolean name="enabledNotifyWapMMSC" value="true" />
-<boolean name="enableMultipartSMS" value="false" />
-</carrier_config>
+ <carrier_config>
+ <boolean name="enabledTransID" value="true" />
+ <boolean name="allowAttachAudio" value="true" />
+ <int name="recipientLimit" value="20" />
+ <string name="uaProfTagName">x-wap-profile</string>
+ <int name="maxImageHeight" value="1944" />
+ <int name="maxSubjectLength" value="80" />
+ <string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
+ <boolean name="show_cdma_choices_bool" value="true" />
+ <string name="emailGatewayNumber">6245</string>
+ <int name="cdma_3waycall_flash_delay_int" value="300" />
+ <int name="maxMessageSize" value="1048576" />
+ <boolean name="enableMMSReadReports" value="false" />
+ <int name="maxImageWidth" value="2592" />
+ <boolean name="enabledNotifyWapMMSC" value="true" />
+ <boolean name="enableMultipartSMS" value="false" />
+ </carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_311585.xml b/assets/carrier_config_311585.xml
index 049c65a..5f9058e 100644
--- a/assets/carrier_config_311585.xml
+++ b/assets/carrier_config_311585.xml
@@ -1,19 +1,20 @@
<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
<carrier_config_list>
-<carrier_config>
-<boolean name="enabledTransID" value="true" />
-<boolean name="allowAttachAudio" value="true" />
-<int name="recipientLimit" value="20" />
-<string name="uaProfTagName">x-wap-profile</string>
-<int name="maxImageHeight" value="1944" />
-<int name="maxSubjectLength" value="80" />
-<string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
-<boolean name="show_cdma_choices_bool" value="true" />
-<string name="emailGatewayNumber">6245</string>
-<int name="maxMessageSize" value="1048576" />
-<boolean name="enableMMSReadReports" value="false" />
-<int name="maxImageWidth" value="2592" />
-<boolean name="enabledNotifyWapMMSC" value="true" />
-<boolean name="enableMultipartSMS" value="false" />
-</carrier_config>
+ <carrier_config>
+ <boolean name="enabledTransID" value="true" />
+ <boolean name="allowAttachAudio" value="true" />
+ <int name="recipientLimit" value="20" />
+ <string name="uaProfTagName">x-wap-profile</string>
+ <int name="maxImageHeight" value="1944" />
+ <int name="maxSubjectLength" value="80" />
+ <string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
+ <boolean name="show_cdma_choices_bool" value="true" />
+ <string name="emailGatewayNumber">6245</string>
+ <int name="cdma_3waycall_flash_delay_int" value="300" />
+ <int name="maxMessageSize" value="1048576" />
+ <boolean name="enableMMSReadReports" value="false" />
+ <int name="maxImageWidth" value="2592" />
+ <boolean name="enabledNotifyWapMMSC" value="true" />
+ <boolean name="enableMultipartSMS" value="false" />
+ </carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_311586.xml b/assets/carrier_config_311586.xml
index 049c65a..5f9058e 100644
--- a/assets/carrier_config_311586.xml
+++ b/assets/carrier_config_311586.xml
@@ -1,19 +1,20 @@
<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
<carrier_config_list>
-<carrier_config>
-<boolean name="enabledTransID" value="true" />
-<boolean name="allowAttachAudio" value="true" />
-<int name="recipientLimit" value="20" />
-<string name="uaProfTagName">x-wap-profile</string>
-<int name="maxImageHeight" value="1944" />
-<int name="maxSubjectLength" value="80" />
-<string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
-<boolean name="show_cdma_choices_bool" value="true" />
-<string name="emailGatewayNumber">6245</string>
-<int name="maxMessageSize" value="1048576" />
-<boolean name="enableMMSReadReports" value="false" />
-<int name="maxImageWidth" value="2592" />
-<boolean name="enabledNotifyWapMMSC" value="true" />
-<boolean name="enableMultipartSMS" value="false" />
-</carrier_config>
+ <carrier_config>
+ <boolean name="enabledTransID" value="true" />
+ <boolean name="allowAttachAudio" value="true" />
+ <int name="recipientLimit" value="20" />
+ <string name="uaProfTagName">x-wap-profile</string>
+ <int name="maxImageHeight" value="1944" />
+ <int name="maxSubjectLength" value="80" />
+ <string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
+ <boolean name="show_cdma_choices_bool" value="true" />
+ <string name="emailGatewayNumber">6245</string>
+ <int name="cdma_3waycall_flash_delay_int" value="300" />
+ <int name="maxMessageSize" value="1048576" />
+ <boolean name="enableMMSReadReports" value="false" />
+ <int name="maxImageWidth" value="2592" />
+ <boolean name="enabledNotifyWapMMSC" value="true" />
+ <boolean name="enableMultipartSMS" value="false" />
+ </carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_311587.xml b/assets/carrier_config_311587.xml
index 049c65a..5f9058e 100644
--- a/assets/carrier_config_311587.xml
+++ b/assets/carrier_config_311587.xml
@@ -1,19 +1,20 @@
<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
<carrier_config_list>
-<carrier_config>
-<boolean name="enabledTransID" value="true" />
-<boolean name="allowAttachAudio" value="true" />
-<int name="recipientLimit" value="20" />
-<string name="uaProfTagName">x-wap-profile</string>
-<int name="maxImageHeight" value="1944" />
-<int name="maxSubjectLength" value="80" />
-<string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
-<boolean name="show_cdma_choices_bool" value="true" />
-<string name="emailGatewayNumber">6245</string>
-<int name="maxMessageSize" value="1048576" />
-<boolean name="enableMMSReadReports" value="false" />
-<int name="maxImageWidth" value="2592" />
-<boolean name="enabledNotifyWapMMSC" value="true" />
-<boolean name="enableMultipartSMS" value="false" />
-</carrier_config>
+ <carrier_config>
+ <boolean name="enabledTransID" value="true" />
+ <boolean name="allowAttachAudio" value="true" />
+ <int name="recipientLimit" value="20" />
+ <string name="uaProfTagName">x-wap-profile</string>
+ <int name="maxImageHeight" value="1944" />
+ <int name="maxSubjectLength" value="80" />
+ <string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
+ <boolean name="show_cdma_choices_bool" value="true" />
+ <string name="emailGatewayNumber">6245</string>
+ <int name="cdma_3waycall_flash_delay_int" value="300" />
+ <int name="maxMessageSize" value="1048576" />
+ <boolean name="enableMMSReadReports" value="false" />
+ <int name="maxImageWidth" value="2592" />
+ <boolean name="enabledNotifyWapMMSC" value="true" />
+ <boolean name="enableMultipartSMS" value="false" />
+ </carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_311588.xml b/assets/carrier_config_311588.xml
index 049c65a..5f9058e 100644
--- a/assets/carrier_config_311588.xml
+++ b/assets/carrier_config_311588.xml
@@ -1,19 +1,20 @@
<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
<carrier_config_list>
-<carrier_config>
-<boolean name="enabledTransID" value="true" />
-<boolean name="allowAttachAudio" value="true" />
-<int name="recipientLimit" value="20" />
-<string name="uaProfTagName">x-wap-profile</string>
-<int name="maxImageHeight" value="1944" />
-<int name="maxSubjectLength" value="80" />
-<string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
-<boolean name="show_cdma_choices_bool" value="true" />
-<string name="emailGatewayNumber">6245</string>
-<int name="maxMessageSize" value="1048576" />
-<boolean name="enableMMSReadReports" value="false" />
-<int name="maxImageWidth" value="2592" />
-<boolean name="enabledNotifyWapMMSC" value="true" />
-<boolean name="enableMultipartSMS" value="false" />
-</carrier_config>
+ <carrier_config>
+ <boolean name="enabledTransID" value="true" />
+ <boolean name="allowAttachAudio" value="true" />
+ <int name="recipientLimit" value="20" />
+ <string name="uaProfTagName">x-wap-profile</string>
+ <int name="maxImageHeight" value="1944" />
+ <int name="maxSubjectLength" value="80" />
+ <string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
+ <boolean name="show_cdma_choices_bool" value="true" />
+ <string name="emailGatewayNumber">6245</string>
+ <int name="cdma_3waycall_flash_delay_int" value="300" />
+ <int name="maxMessageSize" value="1048576" />
+ <boolean name="enableMMSReadReports" value="false" />
+ <int name="maxImageWidth" value="2592" />
+ <boolean name="enabledNotifyWapMMSC" value="true" />
+ <boolean name="enableMultipartSMS" value="false" />
+ </carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_311589.xml b/assets/carrier_config_311589.xml
index 049c65a..5f9058e 100644
--- a/assets/carrier_config_311589.xml
+++ b/assets/carrier_config_311589.xml
@@ -1,19 +1,20 @@
<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
<carrier_config_list>
-<carrier_config>
-<boolean name="enabledTransID" value="true" />
-<boolean name="allowAttachAudio" value="true" />
-<int name="recipientLimit" value="20" />
-<string name="uaProfTagName">x-wap-profile</string>
-<int name="maxImageHeight" value="1944" />
-<int name="maxSubjectLength" value="80" />
-<string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
-<boolean name="show_cdma_choices_bool" value="true" />
-<string name="emailGatewayNumber">6245</string>
-<int name="maxMessageSize" value="1048576" />
-<boolean name="enableMMSReadReports" value="false" />
-<int name="maxImageWidth" value="2592" />
-<boolean name="enabledNotifyWapMMSC" value="true" />
-<boolean name="enableMultipartSMS" value="false" />
-</carrier_config>
+ <carrier_config>
+ <boolean name="enabledTransID" value="true" />
+ <boolean name="allowAttachAudio" value="true" />
+ <int name="recipientLimit" value="20" />
+ <string name="uaProfTagName">x-wap-profile</string>
+ <int name="maxImageHeight" value="1944" />
+ <int name="maxSubjectLength" value="80" />
+ <string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
+ <boolean name="show_cdma_choices_bool" value="true" />
+ <string name="emailGatewayNumber">6245</string>
+ <int name="cdma_3waycall_flash_delay_int" value="300" />
+ <int name="maxMessageSize" value="1048576" />
+ <boolean name="enableMMSReadReports" value="false" />
+ <int name="maxImageWidth" value="2592" />
+ <boolean name="enabledNotifyWapMMSC" value="true" />
+ <boolean name="enableMultipartSMS" value="false" />
+ </carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_311870.xml b/assets/carrier_config_311870.xml
index 468a409..b5417e0 100644
--- a/assets/carrier_config_311870.xml
+++ b/assets/carrier_config_311870.xml
@@ -1,22 +1,23 @@
<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
<carrier_config_list>
-<carrier_config>
-<int name="smsToMmsTextThreshold" value="6" />
-<boolean name="enableSMSDeliveryReports" value="false" />
-<int name="maxMessageTextSize" value="-1" />
-<boolean name="supportMmsContentDisposition" value="false" />
-<int name="recipientLimit" value="40" />
-<int name="maxImageHeight" value="1944" />
-<boolean name="enableMMSDeliveryReports" value="false" />
-<int name="maxSubjectLength" value="80" />
-<string name="httpParams">X-MDN: ##LINE1##|Proxy-Authorization: Basic ##NAI##</string>
-<string name="emailGatewayNumber">6245</string>
-<int name="maxMessageSize" value="1048576" />
-<string name="naiSuffix">:pcs</string>
-<boolean name="enableMMSReadReports" value="false" />
-<int name="maxImageWidth" value="2592" />
-<boolean name="enabledMMS" value="true" />
-<boolean name="enableMultipartSMS" value="true" />
-<string name="carrier_eri_file_name_string">eri_311870.xml</string>
-</carrier_config>
+ <carrier_config>
+ <int name="smsToMmsTextThreshold" value="6" />
+ <boolean name="enableSMSDeliveryReports" value="false" />
+ <int name="maxMessageTextSize" value="-1" />
+ <boolean name="supportMmsContentDisposition" value="false" />
+ <int name="recipientLimit" value="40" />
+ <int name="maxImageHeight" value="1944" />
+ <boolean name="enableMMSDeliveryReports" value="false" />
+ <int name="maxSubjectLength" value="80" />
+ <string name="httpParams">X-MDN: ##LINE1##|Proxy-Authorization: Basic ##NAI##</string>
+ <string name="emailGatewayNumber">6245</string>
+ <int name="maxMessageSize" value="1048576" />
+ <int name="cdma_3waycall_flash_delay_int" value="300" />
+ <string name="naiSuffix">:pcs</string>
+ <boolean name="enableMMSReadReports" value="false" />
+ <int name="maxImageWidth" value="2592" />
+ <boolean name="enabledMMS" value="true" />
+ <boolean name="enableMultipartSMS" value="true" />
+ <string name="carrier_eri_file_name_string">eri_311870.xml</string>
+ </carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_312530.xml b/assets/carrier_config_312530.xml
index 46a9d0c..7f33381 100644
--- a/assets/carrier_config_312530.xml
+++ b/assets/carrier_config_312530.xml
@@ -1,22 +1,23 @@
<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
<carrier_config_list>
-<carrier_config>
-<int name="smsToMmsTextThreshold" value="6" />
-<boolean name="enableSMSDeliveryReports" value="false" />
-<int name="maxMessageTextSize" value="-1" />
-<boolean name="supportMmsContentDisposition" value="false" />
-<int name="recipientLimit" value="40" />
-<int name="maxImageHeight" value="1944" />
-<boolean name="enableMMSDeliveryReports" value="false" />
-<int name="maxSubjectLength" value="80" />
-<string name="httpParams">X-MDN: ##LINE1##|Proxy-Authorization: Basic ##NAI##</string>
-<string name="emailGatewayNumber">6245</string>
-<int name="maxMessageSize" value="1048576" />
-<string name="naiSuffix">:pcs</string>
-<boolean name="enableMMSReadReports" value="false" />
-<int name="maxImageWidth" value="2592" />
-<boolean name="enabledMMS" value="true" />
-<boolean name="enableMultipartSMS" value="true" />
-<string name="carrier_eri_file_name_string">eri_310120.xml</string>
-</carrier_config>
+ <carrier_config>
+ <int name="smsToMmsTextThreshold" value="6" />
+ <boolean name="enableSMSDeliveryReports" value="false" />
+ <int name="maxMessageTextSize" value="-1" />
+ <boolean name="supportMmsContentDisposition" value="false" />
+ <int name="recipientLimit" value="40" />
+ <int name="maxImageHeight" value="1944" />
+ <boolean name="enableMMSDeliveryReports" value="false" />
+ <int name="maxSubjectLength" value="80" />
+ <string name="httpParams">X-MDN: ##LINE1##|Proxy-Authorization: Basic ##NAI##</string>
+ <string name="emailGatewayNumber">6245</string>
+ <int name="maxMessageSize" value="1048576" />
+ <int name="cdma_3waycall_flash_delay_int" value="300" />
+ <string name="naiSuffix">:pcs</string>
+ <boolean name="enableMMSReadReports" value="false" />
+ <int name="maxImageWidth" value="2592" />
+ <boolean name="enabledMMS" value="true" />
+ <boolean name="enableMultipartSMS" value="true" />
+ <string name="carrier_eri_file_name_string">eri_310120.xml</string>
+ </carrier_config>
</carrier_config_list>
diff --git a/tests/Android.mk b/tests/Android.mk
index b0d3c22..fe6aa71 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -9,6 +9,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PACKAGE_NAME := CarrierConfigTests
+LOCAL_COMPATIBILITY_SUITE := device-tests
LOCAL_CERTIFICATE := platform
LOCAL_INSTRUMENTATION_FOR := CarrierConfig
diff --git a/tests/AndroidTest.xml b/tests/AndroidTest.xml
new file mode 100644
index 0000000..8fe9593
--- /dev/null
+++ b/tests/AndroidTest.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<configuration description="Run Tests for CarrierConfig.">
+ <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
+ <option name="test-file-name" value="CarrierConfigTests.apk" />
+ </target_preparer>
+
+ <option name="test-suite-tag" value="apct" />
+ <option name="test-tag" value="CarrierConfigTests" />
+ <test class="com.android.tradefed.testtype.InstrumentationTest" >
+ <option name="package" value="com.android.carrierconfig.tests" />
+ <option name="runner" value="android.test.InstrumentationTestRunner" />
+ </test>
+</configuration>
diff --git a/tests/src/com/android/carrierconfig/CarrierConfigTest.java b/tests/src/com/android/carrierconfig/CarrierConfigTest.java
index 8404302..3efe3d6 100644
--- a/tests/src/com/android/carrierconfig/CarrierConfigTest.java
+++ b/tests/src/com/android/carrierconfig/CarrierConfigTest.java
@@ -83,12 +83,16 @@ public class CarrierConfigTest extends InstrumentationTestCase {
while (((event = parser.next()) != XmlPullParser.END_DOCUMENT)) {
if (event == XmlPullParser.START_TAG) {
switch (parser.getName()) {
+ case "int-array":
+ case "string-array":
+ // string-array and int-array require the 'num' attribute
+ final String varNum = parser.getAttributeValue(null, "num");
+ assertNotNull("No 'num' attribute in array: "
+ + parser.getPositionDescription(), varNum);
case "int":
case "long":
case "boolean":
case "string":
- case "int-array":
- case "string-array":
// NOTE: This doesn't check for other valid Bundle values, but it
// is limited to the key types in CarrierConfigManager.
final String varName = parser.getAttributeValue(null, "name");