summaryrefslogtreecommitdiffstats
path: root/assets/carrier_config_23415.xml
diff options
context:
space:
mode:
authorAmit Mahajan <amitmahajan@google.com>2016-09-21 10:13:07 -0700
committerAmit Mahajan <amitmahajan@google.com>2016-09-21 10:13:07 -0700
commitf2b2c67c05698ae96cf1a494199dee11bd27b4a6 (patch)
tree38e9245d54e8702bd869f96067496fc7a8eabed5 /assets/carrier_config_23415.xml
parent42b3727a6922fcf1eb45a52deee02a4d4b85b410 (diff)
parentad606fed6219832262c37d96598a32ef987d79a7 (diff)
downloadandroid_packages_apps_CarrierConfig-f2b2c67c05698ae96cf1a494199dee11bd27b4a6.tar.gz
android_packages_apps_CarrierConfig-f2b2c67c05698ae96cf1a494199dee11bd27b4a6.tar.bz2
android_packages_apps_CarrierConfig-f2b2c67c05698ae96cf1a494199dee11bd27b4a6.zip
resolve merge conflicts of ad606fe to master
Change-Id: Ia0583acbaa1b2a063cc8aa599db0d49b1068e284
Diffstat (limited to 'assets/carrier_config_23415.xml')
-rw-r--r--assets/carrier_config_23415.xml3
1 files changed, 3 insertions, 0 deletions
diff --git a/assets/carrier_config_23415.xml b/assets/carrier_config_23415.xml
index 187f0d1..badfc31 100644
--- a/assets/carrier_config_23415.xml
+++ b/assets/carrier_config_23415.xml
@@ -3,5 +3,8 @@
<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>
</carrier_config>
</carrier_config_list>