resolve merge conflicts of 930462e to stage-aosp-master am: 87fc790e27

am: f129e47957

Change-Id: I6c786ff53e8188038e7cf4c9d62af4195f878cb6

20 files changed, 122 insertions, 50 deletions

diff --git a/assets/carrier_config_20404.xml b/assets/carrier_config_20404.xml
index b67d4a0..a970698 100644
--- a/assets/carrier_config_20404.xml
+++ b/assets/carrier_config_20404.xml
@@ -4,6 +4,7 @@
         <int name="maxImageHeight" value="1944" />
         <int name="maxMessageSize" value="1048576" />
         <int name="maxImageWidth" value="2592" />
+        <string name="default_vm_number_string">+31654501233</string>
     </carrier_config>
     <carrier_config gid1="BAE0000000000000">
         <boolean name="allow_adding_apns_bool" value="false" />
@@ -31,5 +32,6 @@
             <item value="dun" />
             <item value="supl" />
         </string-array>
+        <string name="default_vm_number_string">*86</string>
     </carrier_config>
 </carrier_config_list>
diff --git a/assets/carrier_config_22210.xml b/assets/carrier_config_22210.xml
index 144cf67..1e682f9 100644
--- a/assets/carrier_config_22210.xml
+++ b/assets/carrier_config_22210.xml
@@ -1,7 +1,8 @@
 <?xml version='1.0' encoding='utf-8' standalone='yes' ?>
 <carrier_config_list>
-<carrier_config>
-<boolean name="carrier_volte_available_bool" value="true" />
-<int name="volte_replacement_rat_int" value="3" />
-</carrier_config>
+    <carrier_config>
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <int name="volte_replacement_rat_int" value="3" />
+        <string name="default_vm_number_string">42020</string>
+    </carrier_config>
 </carrier_config_list>
diff --git a/assets/carrier_config_23201.xml b/assets/carrier_config_23201.xml
new file mode 100644
index 0000000..298b4fd
--- /dev/null
+++ b/assets/carrier_config_23201.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
+<carrier_config_list>
+    <carrier_config>
+        <string name="default_vm_number_string">66477</string>
+    </carrier_config>
+</carrier_config_list>
diff --git a/assets/carrier_config_23410.xml b/assets/carrier_config_23410.xml
index 08eeff2..8ff7e9f 100644
--- a/assets/carrier_config_23410.xml
+++ b/assets/carrier_config_23410.xml
@@ -1,7 +1,14 @@
 <?xml version='1.0' encoding='utf-8' standalone='yes' ?>
 <carrier_config_list>
-<carrier_config>
-<int name="smsToMmsTextThreshold" value="10" />
-<boolean name="prefer_2g_bool" value="false" />
-</carrier_config>
+    <carrier_config>
+        <int name="smsToMmsTextThreshold" value="10" />
+        <boolean name="prefer_2g_bool" value="false" />
+        <string name="default_vm_number_string">901</string>
+    </carrier_config>
+    <carrier_config gid1="0A">
+        <string name="default_vm_number_string">905</string>
+    </carrier_config>
+    <carrier_config gid1="508">
+        <string name="default_vm_number_string">443</string>
+    </carrier_config>
 </carrier_config_list>
diff --git a/assets/carrier_config_23415.xml b/assets/carrier_config_23415.xml
index ebeb778..f9fe16e 100644
--- a/assets/carrier_config_23415.xml
+++ b/assets/carrier_config_23415.xml
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='utf-8' standalone='yes' ?>
 <carrier_config_list>
-<carrier_config>
-<int name="smsToMmsTextThreshold" value="10" />
-<string-array name="read_only_apn_types_string_array" num="1">
-    <item value="*" />
-</string-array>
-</carrier_config>
+    <carrier_config>
+        <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_23458.xml b/assets/carrier_config_23458.xml
new file mode 100644
index 0000000..4f0be39
--- /dev/null
+++ b/assets/carrier_config_23458.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
+<carrier_config_list>
+    <carrier_config>
+        <string name="default_vm_number_string">121</string>
+    </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..a6256f1
--- /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>
+        <string name="default_vm_number_string">3311</string>
+    </carrier_config>
+</carrier_config_list>
diff --git a/assets/carrier_config_26202.xml b/assets/carrier_config_26202.xml
index 144cf67..56fab51 100644
--- a/assets/carrier_config_26202.xml
+++ b/assets/carrier_config_26202.xml
@@ -1,7 +1,8 @@
 <?xml version='1.0' encoding='utf-8' standalone='yes' ?>
 <carrier_config_list>
-<carrier_config>
-<boolean name="carrier_volte_available_bool" value="true" />
-<int name="volte_replacement_rat_int" value="3" />
-</carrier_config>
+    <carrier_config>
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <int name="volte_replacement_rat_int" value="3" />
+        <string name="default_vm_number_string">5500</string>
+    </carrier_config>
 </carrier_config_list>
diff --git a/assets/carrier_config_26207.xml b/assets/carrier_config_26207.xml
index b80ef47..d502d78 100644
--- a/assets/carrier_config_26207.xml
+++ b/assets/carrier_config_26207.xml
@@ -1,8 +1,9 @@
 <?xml version='1.0' encoding='utf-8' standalone='yes' ?>
 <carrier_config_list>
-<carrier_config>
-<int name="maxImageHeight" value="1944" />
-<int name="maxMessageSize" value="614400" />
-<int name="maxImageWidth" value="2592" />
-</carrier_config>
+    <carrier_config>
+        <int name="maxImageHeight" value="1944" />
+        <int name="maxMessageSize" value="614400" />
+        <int name="maxImageWidth" value="2592" />
+        <string name="default_vm_number_string">+491793000333</string>
+    </carrier_config>
 </carrier_config_list>
diff --git a/assets/carrier_config_26208.xml b/assets/carrier_config_26208.xml
new file mode 100644
index 0000000..dd7e45b
--- /dev/null
+++ b/assets/carrier_config_26208.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
+<carrier_config_list>
+    <carrier_config>
+        <string name="default_vm_number_string">+491793000333</string>
+    </carrier_config>
+</carrier_config_list>
diff --git a/assets/carrier_config_26801.xml b/assets/carrier_config_26801.xml
index 144cf67..c6c0c99 100644
--- a/assets/carrier_config_26801.xml
+++ b/assets/carrier_config_26801.xml
@@ -1,7 +1,8 @@
 <?xml version='1.0' encoding='utf-8' standalone='yes' ?>
 <carrier_config_list>
-<carrier_config>
-<boolean name="carrier_volte_available_bool" value="true" />
-<int name="volte_replacement_rat_int" value="3" />
-</carrier_config>
+    <carrier_config>
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <int name="volte_replacement_rat_int" value="3" />
+        <string name="default_vm_number_string">123</string>
+    </carrier_config>
 </carrier_config_list>
diff --git a/assets/carrier_config_27602.xml b/assets/carrier_config_27602.xml
new file mode 100644
index 0000000..7215d7e
--- /dev/null
+++ b/assets/carrier_config_27602.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
+<carrier_config_list>
+    <carrier_config>
+        <string name="default_vm_number_string">135</string>
+    </carrier_config>
+</carrier_config_list>
diff --git a/assets/carrier_config_310004.xml b/assets/carrier_config_310004.xml
index 844ec2f..ed46b9b 100644
--- a/assets/carrier_config_310004.xml
+++ b/assets/carrier_config_310004.xml
@@ -50,5 +50,6 @@
             <item value="dun" />
             <item value="supl" />
         </string-array>
+        <string name="default_vm_number_string">*86</string>
     </carrier_config>
 </carrier_config_list>
diff --git a/assets/carrier_config_310418.xml b/assets/carrier_config_310418.xml
new file mode 100644
index 0000000..3642926
--- /dev/null
+++ b/assets/carrier_config_310418.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
+<carrier_config_list>
+    <carrier_config>
+        <string name="default_vm_number_string">*86</string>
+    </carrier_config>
+</carrier_config_list>
diff --git a/assets/carrier_config_311480.xml b/assets/carrier_config_311480.xml
index 2580fb9..1c484c2 100644
--- a/assets/carrier_config_311480.xml
+++ b/assets/carrier_config_311480.xml
@@ -80,5 +80,6 @@
             <item value="dun" />
             <item value="supl" />
         </string-array>
+        <string name="default_vm_number_string">*86</string>
     </carrier_config>
 </carrier_config_list>
diff --git a/assets/carrier_config_44020.xml b/assets/carrier_config_44020.xml
index 7b128e3..fb8b59a 100644
--- a/assets/carrier_config_44020.xml
+++ b/assets/carrier_config_44020.xml
@@ -1,21 +1,22 @@
 <?xml version='1.0' encoding='utf-8' standalone='yes' ?>
 <carrier_config_list>
-<carrier_config>
-<int name="maxMessageTextSize" value="-1" />
-<int name="recipientLimit" value="-1" />
-<int name="maxImageHeight" value="1944" />
-<int name="maxMessageSize" value="307200" />
-<int name="maxImageWidth" value="2592" />
-<boolean name="enabledMMS" value="true" />
-<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" />
-<int name="ims_dtmf_tone_delay_int" value="215" />
-<boolean name="always_show_emergency_alert_onoff_bool" value="true" />
-<string-array name="carrier_additional_cbs_channels_strings" num="3">
-    <item value="0xA800:type=earthquake, emergency=true" />
-    <item value="0xAFEE:type=tsunami, emergency=true" />
-    <item value="0xAC00-0xAFED:type=other, emergency=true" />
-</string-array>
-</carrier_config>
+    <carrier_config>
+        <int name="maxMessageTextSize" value="-1" />
+        <int name="recipientLimit" value="-1" />
+        <int name="maxImageHeight" value="1944" />
+        <int name="maxMessageSize" value="307200" />
+        <int name="maxImageWidth" value="2592" />
+        <boolean name="enabledMMS" value="true" />
+        <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" />
+        <int name="ims_dtmf_tone_delay_int" value="215" />
+        <boolean name="always_show_emergency_alert_onoff_bool" value="true" />
+        <string-array name="carrier_additional_cbs_channels_strings" num="3">
+            <item value="0xA800:type=earthquake, emergency=true" />
+            <item value="0xAFEE:type=tsunami, emergency=true" />
+            <item value="0xAC00-0xAFED:type=other, emergency=true" />
+        </string-array>
+        <string name="default_vm_number_string">1416</string>
+    </carrier_config>
 </carrier_config_list>
diff --git a/assets/carrier_config_50501.xml b/assets/carrier_config_50501.xml
index b5962c8..b205fda 100644
--- a/assets/carrier_config_50501.xml
+++ b/assets/carrier_config_50501.xml
@@ -1,8 +1,9 @@
 <?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" />
-</carrier_config>
+    <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>
+    </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..941de9c
--- /dev/null
+++ b/assets/carrier_config_50511.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
+<carrier_config_list>
+    <carrier_config>
+        <string name="default_vm_number_string">+61101</string>
+    </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..941de9c
--- /dev/null
+++ b/assets/carrier_config_50571.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
+<carrier_config_list>
+    <carrier_config>
+        <string name="default_vm_number_string">+61101</string>
+    </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..941de9c
--- /dev/null
+++ b/assets/carrier_config_50572.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
+<carrier_config_list>
+    <carrier_config>
+        <string name="default_vm_number_string">+61101</string>
+    </carrier_config>
+</carrier_config_list>