summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Pasanen <dan.pasanen@gmail.com>2017-04-05 08:24:34 -0500
committerDan Pasanen <dan.pasanen@gmail.com>2017-04-05 08:24:34 -0500
commit640ae3e0475bc8f6c3ce1727016dc01e5ad0e164 (patch)
tree5f4f005b2d311f0c7d707a34bf536c25df509e24
parent1f75d78d75e70ea68febb1d5d4ae4d6b4ce7b513 (diff)
parent83f52830ce33399fb91e0763e6729b59dadb3772 (diff)
downloadandroid_packages_apps_CarrierConfig-640ae3e0475bc8f6c3ce1727016dc01e5ad0e164.zip
android_packages_apps_CarrierConfig-640ae3e0475bc8f6c3ce1727016dc01e5ad0e164.tar.gz
android_packages_apps_CarrierConfig-640ae3e0475bc8f6c3ce1727016dc01e5ad0e164.tar.bz2
Merge tag 'android-7.1.2_r2' into cm-14.1
Android 7.1.2 Release 2 (N2G47E) Change-Id: I36e6fa81a83b213daf66c5184143732763f55925
-rw-r--r--assets/carrier_config_20404.xml17
-rw-r--r--assets/carrier_config_20416.xml6
-rw-r--r--assets/carrier_config_20420.xml6
-rw-r--r--assets/carrier_config_21630.xml6
-rw-r--r--assets/carrier_config_21901.xml6
-rw-r--r--assets/carrier_config_22004.xml6
-rw-r--r--assets/carrier_config_22603.xml6
-rw-r--r--assets/carrier_config_22606.xml6
-rw-r--r--assets/carrier_config_23001.xml1
-rw-r--r--assets/carrier_config_23203.xml11
-rw-r--r--assets/carrier_config_23207.xml6
-rw-r--r--assets/carrier_config_26002.xml6
-rw-r--r--assets/carrier_config_26201.xml6
-rw-r--r--assets/carrier_config_29401.xml1
-rw-r--r--assets/carrier_config_29702.xml6
-rw-r--r--assets/carrier_config_310004.xml17
-rw-r--r--assets/carrier_config_310410.xml66
-rw-r--r--assets/carrier_config_311480.xml25
-rw-r--r--assets/carrier_config_44000.xml1
-rw-r--r--assets/carrier_config_44010.xml2
-rw-r--r--assets/carrier_config_44020.xml1
-rw-r--r--assets/carrier_config_44100.xml1
-rw-r--r--assets/carrier_config_44120.xml1
-rw-r--r--assets/carrier_config_50501.xml3
-rw-r--r--assets/carrier_config_50511.xml11
-rw-r--r--assets/carrier_config_50571.xml11
-rw-r--r--assets/carrier_config_50572.xml11
-rw-r--r--src/com/android/carrierconfig/DefaultCarrierConfigService.java8
28 files changed, 214 insertions, 40 deletions
diff --git a/assets/carrier_config_20404.xml b/assets/carrier_config_20404.xml
index b67d4a0..e1ceb34 100644
--- a/assets/carrier_config_20404.xml
+++ b/assets/carrier_config_20404.xml
@@ -6,6 +6,7 @@
<int name="maxImageWidth" value="2592" />
</carrier_config>
<carrier_config gid1="BAE0000000000000">
+ <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>
@@ -13,13 +14,27 @@
<boolean name="editable_wfc_mode_bool" value="false"/>
<boolean name="disable_severe_when_extreme_disabled_bool" value="false" />
<int name="wfc_spn_format_idx_int" value="1" />
- <string-array name="read_only_apn_fields_string_array" num="6">
+ <string-array name="read_only_apn_fields_string_array" num="20">
+ <item value="name" />
+ <item value="proxy" />
+ <item value="port" />
+ <item value="user" />
+ <item value="password" />
+ <item value="server" />
+ <item value="mmsc" />
+ <item value="mmsproxy" />
+ <item value="mmsport" />
+ <item value="mcc" />
+ <item value="mnc" />
+ <item value="authtype" />
<item value="type" />
<item value="protocol" />
<item value="roaming_protocol" />
<item value="bearer" />
<item value="bearer_bitmask" />
<item value="carrier_enabled" />
+ <item value="mvno_type" />
+ <item value="mvno_match_data" />
</string-array>
<string-array name="carrier_metered_apn_types_strings" num="3">
<item value="default" />
diff --git a/assets/carrier_config_20416.xml b/assets/carrier_config_20416.xml
new file mode 100644
index 0000000..e8cacc5
--- /dev/null
+++ b/assets/carrier_config_20416.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
+<carrier_config_list>
+ <carrier_config>
+ <boolean name="display_hd_audio_property_bool" value="false" />
+ </carrier_config>
+</carrier_config_list>
diff --git a/assets/carrier_config_20420.xml b/assets/carrier_config_20420.xml
new file mode 100644
index 0000000..e8cacc5
--- /dev/null
+++ b/assets/carrier_config_20420.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
+<carrier_config_list>
+ <carrier_config>
+ <boolean name="display_hd_audio_property_bool" value="false" />
+ </carrier_config>
+</carrier_config_list>
diff --git a/assets/carrier_config_21630.xml b/assets/carrier_config_21630.xml
new file mode 100644
index 0000000..e8cacc5
--- /dev/null
+++ b/assets/carrier_config_21630.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
+<carrier_config_list>
+ <carrier_config>
+ <boolean name="display_hd_audio_property_bool" value="false" />
+ </carrier_config>
+</carrier_config_list>
diff --git a/assets/carrier_config_21901.xml b/assets/carrier_config_21901.xml
new file mode 100644
index 0000000..e8cacc5
--- /dev/null
+++ b/assets/carrier_config_21901.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
+<carrier_config_list>
+ <carrier_config>
+ <boolean name="display_hd_audio_property_bool" value="false" />
+ </carrier_config>
+</carrier_config_list>
diff --git a/assets/carrier_config_22004.xml b/assets/carrier_config_22004.xml
new file mode 100644
index 0000000..e8cacc5
--- /dev/null
+++ b/assets/carrier_config_22004.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
+<carrier_config_list>
+ <carrier_config>
+ <boolean name="display_hd_audio_property_bool" value="false" />
+ </carrier_config>
+</carrier_config_list>
diff --git a/assets/carrier_config_22603.xml b/assets/carrier_config_22603.xml
new file mode 100644
index 0000000..e8cacc5
--- /dev/null
+++ b/assets/carrier_config_22603.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
+<carrier_config_list>
+ <carrier_config>
+ <boolean name="display_hd_audio_property_bool" value="false" />
+ </carrier_config>
+</carrier_config_list>
diff --git a/assets/carrier_config_22606.xml b/assets/carrier_config_22606.xml
new file mode 100644
index 0000000..e8cacc5
--- /dev/null
+++ b/assets/carrier_config_22606.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
+<carrier_config_list>
+ <carrier_config>
+ <boolean name="display_hd_audio_property_bool" value="false" />
+ </carrier_config>
+</carrier_config_list>
diff --git a/assets/carrier_config_23001.xml b/assets/carrier_config_23001.xml
index 144cf67..baa0c55 100644
--- a/assets/carrier_config_23001.xml
+++ b/assets/carrier_config_23001.xml
@@ -2,6 +2,7 @@
<carrier_config_list>
<carrier_config>
<boolean name="carrier_volte_available_bool" value="true" />
+<boolean name="display_hd_audio_property_bool" value="false" />
<int name="volte_replacement_rat_int" value="3" />
</carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_23203.xml b/assets/carrier_config_23203.xml
index 8cf866f..8e2461a 100644
--- a/assets/carrier_config_23203.xml
+++ b/assets/carrier_config_23203.xml
@@ -1,8 +1,9 @@
<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
<carrier_config_list>
-<carrier_config>
-<string-array name="gsm_nonroaming_networks_string_array" num="1">
- <item value="23210" />
-</string-array>
-</carrier_config>
+ <carrier_config>
+ <boolean name="display_hd_audio_property_bool" value="false" />
+ <string-array name="gsm_nonroaming_networks_string_array" num="1">
+ <item value="23210" />
+ </string-array>
+ </carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_23207.xml b/assets/carrier_config_23207.xml
new file mode 100644
index 0000000..e8cacc5
--- /dev/null
+++ b/assets/carrier_config_23207.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
+<carrier_config_list>
+ <carrier_config>
+ <boolean name="display_hd_audio_property_bool" value="false" />
+ </carrier_config>
+</carrier_config_list>
diff --git a/assets/carrier_config_26002.xml b/assets/carrier_config_26002.xml
new file mode 100644
index 0000000..e8cacc5
--- /dev/null
+++ b/assets/carrier_config_26002.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
+<carrier_config_list>
+ <carrier_config>
+ <boolean name="display_hd_audio_property_bool" value="false" />
+ </carrier_config>
+</carrier_config_list>
diff --git a/assets/carrier_config_26201.xml b/assets/carrier_config_26201.xml
new file mode 100644
index 0000000..e8cacc5
--- /dev/null
+++ b/assets/carrier_config_26201.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
+<carrier_config_list>
+ <carrier_config>
+ <boolean name="display_hd_audio_property_bool" value="false" />
+ </carrier_config>
+</carrier_config_list>
diff --git a/assets/carrier_config_29401.xml b/assets/carrier_config_29401.xml
index 86e05c3..e961712 100644
--- a/assets/carrier_config_29401.xml
+++ b/assets/carrier_config_29401.xml
@@ -4,5 +4,6 @@
<int name="maxImageHeight" value="1944" />
<int name="maxMessageSize" value="102400" />
<int name="maxImageWidth" value="2592" />
+<boolean name="display_hd_audio_property_bool" value="false" />
</carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_29702.xml b/assets/carrier_config_29702.xml
new file mode 100644
index 0000000..e8cacc5
--- /dev/null
+++ b/assets/carrier_config_29702.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
+<carrier_config_list>
+ <carrier_config>
+ <boolean name="display_hd_audio_property_bool" value="false" />
+ </carrier_config>
+</carrier_config_list>
diff --git a/assets/carrier_config_310004.xml b/assets/carrier_config_310004.xml
index 844ec2f..a0adfbd 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="mdn_is_additional_voicemail_number_bool" value="true" />
<boolean name="operator_selection_expand_bool" value="true" />
<int name="aliasMinChars" value="2" />
<int name="smsToMmsTextThreshold" value="7" />
@@ -32,13 +33,27 @@
<boolean name="disable_severe_when_extreme_disabled_bool" value="false" />
<boolean name="mmsCloseConnection" value="true"/>
<int name="wfc_spn_format_idx_int" value="1" />
- <string-array name="read_only_apn_fields_string_array" num="6">
+ <string-array name="read_only_apn_fields_string_array" num="20">
+ <item value="name" />
+ <item value="proxy" />
+ <item value="port" />
+ <item value="user" />
+ <item value="password" />
+ <item value="server" />
+ <item value="mmsc" />
+ <item value="mmsproxy" />
+ <item value="mmsport" />
+ <item value="mcc" />
+ <item value="mnc" />
+ <item value="authtype" />
<item value="type" />
<item value="protocol" />
<item value="roaming_protocol" />
<item value="bearer" />
<item value="bearer_bitmask" />
<item value="carrier_enabled" />
+ <item value="mvno_type" />
+ <item value="mvno_match_data" />
</string-array>
<string-array name="carrier_metered_apn_types_strings" num="3">
<item value="default" />
diff --git a/assets/carrier_config_310410.xml b/assets/carrier_config_310410.xml
index e106f42..cb9f51f 100644
--- a/assets/carrier_config_310410.xml
+++ b/assets/carrier_config_310410.xml
@@ -1,30 +1,42 @@
<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
<carrier_config_list>
-<carrier_config>
-<int name="recipientLimit" value="10" />
-<int name="maxImageHeight" value="1944" />
-<boolean name="support_pause_ims_video_calls_bool" value="false" />
-<int name="maxMessageSize" value="1048576" />
-<int name="maxImageWidth" value="2592" />
-<boolean name="enableSMSDeliveryReports" value="false" />
-<int name="volte_replacement_rat_int" value="3" />
-<boolean name="csp_enabled_bool" value="true" />
-<boolean name="carrier_disable_etws_cmas_dup_detection" value="true" />
-<string-array name="cdma_nonroaming_networks_string_array" num="7">
- <item value="310" />
- <item value="311" />
- <item value="312" />
- <item value="313" />
- <item value="314" />
- <item value="315" />
- <item value="316" />
-</string-array>
-<string-array name="cdma_roaming_networks_string_array" num="5">
- <item value="310110" />
- <item value="310140" />
- <item value="310400" />
- <item value="310470" />
- <item value="311170" />
-</string-array>
-</carrier_config>
+ <carrier_config>
+ <int name="recipientLimit" value="10" />
+ <int name="maxImageHeight" value="1944" />
+ <boolean name="support_pause_ims_video_calls_bool" value="false" />
+ <int name="maxMessageSize" value="1048576" />
+ <int name="maxImageWidth" value="2592" />
+ <boolean name="enableSMSDeliveryReports" value="false" />
+ <int name="volte_replacement_rat_int" value="3" />
+ <boolean name="csp_enabled_bool" value="true" />
+ <boolean name="carrier_disable_etws_cmas_dup_detection" value="true" />
+ <string-array name="carrier_data_call_retry_config_strings" num="3">
+ <!-- New retry pattern: 10s, 3m, 12m, 36m, 36m, 36m, ... (forever)
+ (comparing to the default one used before:
+ 5s, 10s, 20s, 40s, 80s, 2.5m, 5m, 10m, 21m, 30m, 30m..(forever))
+
+ Since AT&T has two APNs, and modem retry 5 times for each, this should be able to
+ reduce the retry number to 40 for the first hour.
+ -->
+ <item value="default:default_randomization=2000,10000,18000:5000,720000:5000,2160000:5000" />
+ <item value="mms:default_randomization=2000,10000,18000:5000,720000:5000,2160000:5000" />
+ <item value="others:max_retries=3,5000,5000,5000" />
+ </string-array>
+ <string-array name="cdma_nonroaming_networks_string_array" num="7">
+ <item value="310" />
+ <item value="311" />
+ <item value="312" />
+ <item value="313" />
+ <item value="314" />
+ <item value="315" />
+ <item value="316" />
+ </string-array>
+ <string-array name="cdma_roaming_networks_string_array" num="5">
+ <item value="310110" />
+ <item value="310140" />
+ <item value="310400" />
+ <item value="310470" />
+ <item value="311170" />
+ </string-array>
+ </carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_311480.xml b/assets/carrier_config_311480.xml
index 2580fb9..76887a4 100644
--- a/assets/carrier_config_311480.xml
+++ b/assets/carrier_config_311480.xml
@@ -2,6 +2,7 @@
<carrier_config_list>
<carrier_config>
<boolean name="allow_hold_in_ims_call" value="false" />
+ <boolean name="mdn_is_additional_voicemail_number_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" />
@@ -44,12 +45,13 @@
<boolean name="video_calls_can_be_hd_audio" value="false" />
<boolean name="allow_add_call_during_video_call" value="false" />
<boolean name="carrier_promote_wfc_on_call_fail_bool" value="true" />
- <string-array name="ims_reasoninfo_mapping_string_array" num="8">
+ <string-array name="ims_reasoninfo_mapping_string_array" num="9">
<item value="332|simultaneous call limit has already been reached|1403" />
<item value="332|Forbidden: Simultaneous Call Limit Has Already Been Reached|1403" />
<item value="338|another device sent all devices busy response|1404" />
<item value="501|call completion elsewhere|1014" />
<item value="501|call has been pulled by another device|1016" />
+ <item value="510|call has been pulled by another device|1016" />
<item value="501|another device sent all devices busy response|1404" />
<item value="510|another device sent all devices busy response|1404" />
<item value="1014|call has been pulled by another device|1016" />
@@ -62,13 +64,27 @@
<item value="WIRELESS CALLER" />
<item value="UNKNOWN NAME" />
</string-array>
- <string-array name="read_only_apn_fields_string_array" num="6">
+ <string-array name="read_only_apn_fields_string_array" num="20">
+ <item value="name" />
+ <item value="proxy" />
+ <item value="port" />
+ <item value="user" />
+ <item value="password" />
+ <item value="server" />
+ <item value="mmsc" />
+ <item value="mmsproxy" />
+ <item value="mmsport" />
+ <item value="mcc" />
+ <item value="mnc" />
+ <item value="authtype" />
<item value="type" />
<item value="protocol" />
<item value="roaming_protocol" />
<item value="bearer" />
<item value="bearer_bitmask" />
<item value="carrier_enabled" />
+ <item value="mvno_type" />
+ <item value="mvno_match_data" />
</string-array>
<string-array name="carrier_metered_apn_types_strings" num="3">
<item value="default" />
@@ -80,5 +96,10 @@
<item value="dun" />
<item value="supl" />
</string-array>
+ <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" />
+ <item value="*72" />
+ </string-array>
</carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_44000.xml b/assets/carrier_config_44000.xml
index 08b3e73..a1e728b 100644
--- a/assets/carrier_config_44000.xml
+++ b/assets/carrier_config_44000.xml
@@ -10,5 +10,6 @@
<boolean name="carrier_force_disable_etws_cmas_test_bool" value="true" />
<boolean name="carrier_volte_available_bool" value="true" />
<int name="volte_replacement_rat_int" value="3" />
+<long name="message_expiration_time_long" value="3600000" />
</carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_44010.xml b/assets/carrier_config_44010.xml
index cb4ae1c..8936279 100644
--- a/assets/carrier_config_44010.xml
+++ b/assets/carrier_config_44010.xml
@@ -7,5 +7,7 @@
<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" />
</carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_44020.xml b/assets/carrier_config_44020.xml
index 7b128e3..4dfcf27 100644
--- a/assets/carrier_config_44020.xml
+++ b/assets/carrier_config_44020.xml
@@ -17,5 +17,6 @@
<item value="0xAFEE:type=tsunami, emergency=true" />
<item value="0xAC00-0xAFED:type=other, emergency=true" />
</string-array>
+<long name="message_expiration_time_long" value="3600000" />
</carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_44100.xml b/assets/carrier_config_44100.xml
index 08b3e73..a1e728b 100644
--- a/assets/carrier_config_44100.xml
+++ b/assets/carrier_config_44100.xml
@@ -10,5 +10,6 @@
<boolean name="carrier_force_disable_etws_cmas_test_bool" value="true" />
<boolean name="carrier_volte_available_bool" value="true" />
<int name="volte_replacement_rat_int" value="3" />
+<long name="message_expiration_time_long" value="3600000" />
</carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_44120.xml b/assets/carrier_config_44120.xml
index 08b3e73..a1e728b 100644
--- a/assets/carrier_config_44120.xml
+++ b/assets/carrier_config_44120.xml
@@ -10,5 +10,6 @@
<boolean name="carrier_force_disable_etws_cmas_test_bool" value="true" />
<boolean name="carrier_volte_available_bool" value="true" />
<int name="volte_replacement_rat_int" value="3" />
+<long name="message_expiration_time_long" value="3600000" />
</carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_50501.xml b/assets/carrier_config_50501.xml
index b5962c8..78e8e20 100644
--- a/assets/carrier_config_50501.xml
+++ b/assets/carrier_config_50501.xml
@@ -4,5 +4,8 @@
<int name="maxImageHeight" value="1944" />
<int name="maxMessageSize" value="2097152" />
<int name="maxImageWidth" value="2592" />
+<string name="default_vm_number_string">+61101</string>
+<int name="carrier_default_wfc_ims_mode_int" value="1" />
+<boolean name="editable_tether_apn_bool" value="true" />
</carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_50511.xml b/assets/carrier_config_50511.xml
new file mode 100644
index 0000000..78e8e20
--- /dev/null
+++ b/assets/carrier_config_50511.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
+<carrier_config_list>
+<carrier_config>
+<int name="maxImageHeight" value="1944" />
+<int name="maxMessageSize" value="2097152" />
+<int name="maxImageWidth" value="2592" />
+<string name="default_vm_number_string">+61101</string>
+<int name="carrier_default_wfc_ims_mode_int" value="1" />
+<boolean name="editable_tether_apn_bool" value="true" />
+</carrier_config>
+</carrier_config_list>
diff --git a/assets/carrier_config_50571.xml b/assets/carrier_config_50571.xml
new file mode 100644
index 0000000..78e8e20
--- /dev/null
+++ b/assets/carrier_config_50571.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
+<carrier_config_list>
+<carrier_config>
+<int name="maxImageHeight" value="1944" />
+<int name="maxMessageSize" value="2097152" />
+<int name="maxImageWidth" value="2592" />
+<string name="default_vm_number_string">+61101</string>
+<int name="carrier_default_wfc_ims_mode_int" value="1" />
+<boolean name="editable_tether_apn_bool" value="true" />
+</carrier_config>
+</carrier_config_list>
diff --git a/assets/carrier_config_50572.xml b/assets/carrier_config_50572.xml
new file mode 100644
index 0000000..78e8e20
--- /dev/null
+++ b/assets/carrier_config_50572.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
+<carrier_config_list>
+<carrier_config>
+<int name="maxImageHeight" value="1944" />
+<int name="maxMessageSize" value="2097152" />
+<int name="maxImageWidth" value="2592" />
+<string name="default_vm_number_string">+61101</string>
+<int name="carrier_default_wfc_ims_mode_int" value="1" />
+<boolean name="editable_tether_apn_bool" value="true" />
+</carrier_config>
+</carrier_config_list>
diff --git a/src/com/android/carrierconfig/DefaultCarrierConfigService.java b/src/com/android/carrierconfig/DefaultCarrierConfigService.java
index 9081821..9009640 100644
--- a/src/com/android/carrierconfig/DefaultCarrierConfigService.java
+++ b/src/com/android/carrierconfig/DefaultCarrierConfigService.java
@@ -175,16 +175,16 @@ public class DefaultCarrierConfigService extends CarrierService {
result = result && value.equals(id.getMnc());
break;
case "gid1":
- result = result && value.equals(id.getGid1());
+ result = result && value.equalsIgnoreCase(id.getGid1());
break;
case "gid2":
- result = result && value.equals(id.getGid2());
+ result = result && value.equalsIgnoreCase(id.getGid2());
break;
case "spn":
- result = result && value.equals(id.getSpn());
+ result = result && value.equalsIgnoreCase(id.getSpn());
break;
case "device":
- result = result && value.equals(Build.DEVICE);
+ result = result && value.equalsIgnoreCase(Build.DEVICE);
break;
default:
Log.e(TAG, "Unknown attribute " + attribute + "=" + value);