From 6edbb5e7ccf59fa10829611e53ac5a03127cca30 Mon Sep 17 00:00:00 2001
From: Junda Liu <junda@google.com>
Date: Mon, 12 Dec 2016 15:38:30 -0800
Subject: Override editable_tether_apn_bool for Telstra.

Also merge AOSP change to resolve conflicts.

Bug: b/30622475
Change-Id: I90940074ac6c97357d524ecba4fa88de9331166f
---
 assets/carrier_config_50501.xml |  3 +++
 assets/carrier_config_50511.xml | 11 +++++++++++
 assets/carrier_config_50571.xml | 11 +++++++++++
 assets/carrier_config_50572.xml | 11 +++++++++++
 4 files changed, 36 insertions(+)
 create mode 100644 assets/carrier_config_50511.xml
 create mode 100644 assets/carrier_config_50571.xml
 create mode 100644 assets/carrier_config_50572.xml

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>
-- 
cgit v1.2.3