summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunda Liu <junda@google.com>2016-12-12 15:38:30 -0800
committerJunda Liu <junda@google.com>2016-12-14 11:31:17 -0800
commit6edbb5e7ccf59fa10829611e53ac5a03127cca30 (patch)
tree18c4d55a173004789fc6012936b5f042eb589e7e
parentdd8ae4ef01961f8ddd67b20afc731b76c9231b62 (diff)
downloadandroid_packages_apps_CarrierConfig-6edbb5e7ccf59fa10829611e53ac5a03127cca30.zip
android_packages_apps_CarrierConfig-6edbb5e7ccf59fa10829611e53ac5a03127cca30.tar.gz
android_packages_apps_CarrierConfig-6edbb5e7ccf59fa10829611e53ac5a03127cca30.tar.bz2
Override editable_tether_apn_bool for Telstra.
Also merge AOSP change to resolve conflicts. Bug: b/30622475 Change-Id: I90940074ac6c97357d524ecba4fa88de9331166f
-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
4 files changed, 36 insertions, 0 deletions
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>