From de939fe559ebf45f16d23ce92867d7b805736297 Mon Sep 17 00:00:00 2001
From: Jack Yu <jackyu@google.com>
Date: Tue, 11 Oct 2016 11:57:56 -0700
Subject: Added CMAS/ETWS duplicate expiration support

Now message duplication detection will only look back messages
for 24 hours by default for all countries, except 1 hour in
Japan.

Test: runtest -x packages/apps/CellBroadcastReceiver/tests/unit

bug: 31171149
Change-Id: Iab279d1a0b2ea26ef63b09cb9922fe1631e2dfae
---
 assets/carrier_config_44000.xml | 1 +
 assets/carrier_config_44010.xml | 1 +
 assets/carrier_config_44020.xml | 1 +
 assets/carrier_config_44100.xml | 1 +
 assets/carrier_config_44120.xml | 1 +
 5 files changed, 5 insertions(+)

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..8a78531 100644
--- a/assets/carrier_config_44010.xml
+++ b/assets/carrier_config_44010.xml
@@ -7,5 +7,6 @@
 <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" />
 </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>
-- 
cgit v1.2.3


From 071f7b5fb2fc0af47b6673e5b55c3cae41e085eb Mon Sep 17 00:00:00 2001
From: Jack Yu <jackyu@google.com>
Date: Tue, 15 Nov 2016 16:16:58 -0800
Subject: Added configuration for VT downgrade/tear down when data disabled

Added a new flag that allows carriers to ignore data disabled
(e.g. data reaches limit or user disables data) so VT calls
will not be downgraded/torn down and VT service will not be
disabled.

bug: 32880745
Merged-In: I965144ed990ebf39837a71c087f347c87f822817
Change-Id: Idf42967dc6a2a4d2d165d61bdac59e4c574a4cb6
---
 assets/carrier_config_44020.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/assets/carrier_config_44020.xml b/assets/carrier_config_44020.xml
index 4dfcf27..e98bba2 100644
--- a/assets/carrier_config_44020.xml
+++ b/assets/carrier_config_44020.xml
@@ -18,5 +18,6 @@
     <item value="0xAC00-0xAFED:type=other, emergency=true" />
 </string-array>
 <long name="message_expiration_time_long" value="3600000" />
+<boolean name="ignore_data_enabled_changed_for_video_calls" value="true" />
 </carrier_config>
 </carrier_config_list>
-- 
cgit v1.2.3


From 0665760d783c9ce7688359030ea2530e8c1ebb0a Mon Sep 17 00:00:00 2001
From: Meng Wang <mewan@google.com>
Date: Thu, 17 Nov 2016 10:38:23 -0800
Subject: DO NOT MERGE: CarrierConfig: ignore case when comparing mvno

Follow the convention in ApnSetting where mnvo matching ignores case.

Bug: 32962509
Change-Id: Ifc6a9492505cab2821218c27f36a34dd6d892c86
---
 src/com/android/carrierconfig/DefaultCarrierConfigService.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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


From 25fda5d7b2ae6a82e0cef92738dd89e9058b14fd Mon Sep 17 00:00:00 2001
From: Jack Yu <jackyu@google.com>
Date: Tue, 22 Nov 2016 07:18:12 -0800
Subject: Fixed the incorrect VT carrier settings.

The settings should be turned on for Docomo
instead of Softbank.

Test: telephony unit tests
bug: 32880745
Change-Id: Ic5d5bf2d78aaa2c068129b1c64669729b18e8ec7
Merged-In: Ic1f5d5fa7b2ec394fed77e246fff3c14bc281f26
---
 assets/carrier_config_44010.xml | 1 +
 assets/carrier_config_44020.xml | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/carrier_config_44010.xml b/assets/carrier_config_44010.xml
index 8a78531..8936279 100644
--- a/assets/carrier_config_44010.xml
+++ b/assets/carrier_config_44010.xml
@@ -8,5 +8,6 @@
 <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 e98bba2..4dfcf27 100644
--- a/assets/carrier_config_44020.xml
+++ b/assets/carrier_config_44020.xml
@@ -18,6 +18,5 @@
     <item value="0xAC00-0xAFED:type=other, emergency=true" />
 </string-array>
 <long name="message_expiration_time_long" value="3600000" />
-<boolean name="ignore_data_enabled_changed_for_video_calls" value="true" />
 </carrier_config>
 </carrier_config_list>
-- 
cgit v1.2.3


From dca13aefa0510b874604198943f27515cd354e2c Mon Sep 17 00:00:00 2001
From: Jack Yu <jackyu@google.com>
Date: Tue, 29 Nov 2016 16:45:21 -0800
Subject: Reduced the data retry to 40 times for the first hour for AT&T

Since modem retries each APN for 5 times, we reduced the retry
from the telephony to 8 times for the first hour. This is to
comply AT&T GSM-BTR-1-1728.

Test: manual test
bug: 31923783
Merged-In: I7fb104c4060c22c30695afbb8210fdd75404783d
Change-Id: I198fe26cb262642e6dc2d29833bea003c34c7a7b
---
 assets/carrier_config_310410.xml | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/assets/carrier_config_310410.xml b/assets/carrier_config_310410.xml
index 97874a4..090aec4 100644
--- a/assets/carrier_config_310410.xml
+++ b/assets/carrier_config_310410.xml
@@ -1,13 +1,25 @@
 <?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" />
-</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" />
+        <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>
+    </carrier_config>
 </carrier_config_list>
-- 
cgit v1.2.3


From 1291a5d3cf8038ade9f7d0c527382acbfe52f0f8 Mon Sep 17 00:00:00 2001
From: Jordan Liu <jminjie@google.com>
Date: Wed, 9 Nov 2016 13:30:12 -0800
Subject: Add carrierconfigs to treat mdn as VM number

Add the carrier configs which specify whether the carrier treats the mdn
as an additional voicemail number.

Change-Id: I9bc095427564cf587734fd2d308a88abc7d88891
Merged-In: I9bc095427564cf587734fd2d308a88abc7d88891
Fix: 29145323
Test: build and flash on device
---
 assets/carrier_config_20404.xml  | 1 +
 assets/carrier_config_310004.xml | 1 +
 assets/carrier_config_311480.xml | 1 +
 3 files changed, 3 insertions(+)

diff --git a/assets/carrier_config_20404.xml b/assets/carrier_config_20404.xml
index b67d4a0..787f65b 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>
diff --git a/assets/carrier_config_310004.xml b/assets/carrier_config_310004.xml
index 844ec2f..2c92a7e 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" />
diff --git a/assets/carrier_config_311480.xml b/assets/carrier_config_311480.xml
index 2580fb9..372831f 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" />
-- 
cgit v1.2.3


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


From 043ad592401ade64d33063bf3d9dd66de1628479 Mon Sep 17 00:00:00 2001
From: Hall Liu <hallliu@google.com>
Date: Tue, 13 Dec 2016 15:32:30 -0800
Subject: Add disable_hd_audio_icon to carriers

Test: manual
Bug: 33062999
Change-Id: I4aa1c239146c58e772f6e5592db9ca6c2aab412b
---
 assets/carrier_config_20416.xml | 6 ++++++
 assets/carrier_config_20420.xml | 6 ++++++
 assets/carrier_config_21630.xml | 6 ++++++
 assets/carrier_config_21901.xml | 6 ++++++
 assets/carrier_config_22004.xml | 6 ++++++
 assets/carrier_config_22603.xml | 6 ++++++
 assets/carrier_config_22606.xml | 6 ++++++
 assets/carrier_config_23001.xml | 1 +
 assets/carrier_config_23203.xml | 6 ++++++
 assets/carrier_config_23207.xml | 6 ++++++
 assets/carrier_config_26002.xml | 6 ++++++
 assets/carrier_config_26201.xml | 6 ++++++
 assets/carrier_config_29401.xml | 1 +
 assets/carrier_config_29702.xml | 6 ++++++
 14 files changed, 74 insertions(+)
 create mode 100644 assets/carrier_config_20416.xml
 create mode 100644 assets/carrier_config_20420.xml
 create mode 100644 assets/carrier_config_21630.xml
 create mode 100644 assets/carrier_config_21901.xml
 create mode 100644 assets/carrier_config_22004.xml
 create mode 100644 assets/carrier_config_22603.xml
 create mode 100644 assets/carrier_config_22606.xml
 create mode 100644 assets/carrier_config_23203.xml
 create mode 100644 assets/carrier_config_23207.xml
 create mode 100644 assets/carrier_config_26002.xml
 create mode 100644 assets/carrier_config_26201.xml
 create mode 100644 assets/carrier_config_29702.xml

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
new file mode 100644
index 0000000..e8cacc5
--- /dev/null
+++ b/assets/carrier_config_23203.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_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>
-- 
cgit v1.2.3


From c8494c29a3f89afd936a37227cdd09e1a86f4962 Mon Sep 17 00:00:00 2001
From: Brad Ebinger <breadley@google.com>
Date: Mon, 12 Dec 2016 16:18:24 -0800
Subject: Turn off 3gpp MMI codes while roaming on certain carriers

Test: Manual
Bug: 30106345
Merged-In: Ib24aa1ca2f72a51dde8e0fa2fe79bcfc5d94de76
Change-Id: Ib24aa1ca2f72a51dde8e0fa2fe79bcfc5d94de76
---
 assets/carrier_config_311480.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/assets/carrier_config_311480.xml b/assets/carrier_config_311480.xml
index 372831f..0200929 100644
--- a/assets/carrier_config_311480.xml
+++ b/assets/carrier_config_311480.xml
@@ -81,5 +81,6 @@
             <item value="dun" />
             <item value="supl" />
         </string-array>
+        <boolean name="support_3gpp_call_forwarding_while_roaming_bool" value="false" />
     </carrier_config>
 </carrier_config_list>
-- 
cgit v1.2.3


From f88d56131da209b66628430492c7c1e2336394ae Mon Sep 17 00:00:00 2001
From: Brad Ebinger <breadley@google.com>
Date: Mon, 12 Dec 2016 16:23:01 -0800
Subject: Add custom carrier blocking prefixes

Test: Manual
Bug: 30458052
Merged-In: I88dc1fdb51d9333c24a3b9b8f5a1faf27412e435
Change-Id: I88dc1fdb51d9333c24a3b9b8f5a1faf27412e435
---
 assets/carrier_config_311480.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/assets/carrier_config_311480.xml b/assets/carrier_config_311480.xml
index 0200929..32552fd 100644
--- a/assets/carrier_config_311480.xml
+++ b/assets/carrier_config_311480.xml
@@ -82,5 +82,9 @@
             <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>
-- 
cgit v1.2.3


From 85ddde996bc72e8c739f13102c87f3f8912a4bbf Mon Sep 17 00:00:00 2001
From: Tyler Gunn <tgunn@google.com>
Date: Fri, 13 Jan 2017 08:58:48 -0800
Subject: Add multiendpoint ImsReasonInfo remapping.

Adding another remapping for IMS multiendpoint.  The network and modem are
prone to returning code 501 or 510 for some of the messages.
One of these mappings was missing (never saw it in the past).

Test: Manual
Bug: 34274339
Change-Id: I31dee5e54c6924ad72147ba5d41feb1494e4792d
---
 assets/carrier_config_311480.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/assets/carrier_config_311480.xml b/assets/carrier_config_311480.xml
index 32552fd..c67690e 100644
--- a/assets/carrier_config_311480.xml
+++ b/assets/carrier_config_311480.xml
@@ -45,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" />
-- 
cgit v1.2.3


From 83f52830ce33399fb91e0763e6729b59dadb3772 Mon Sep 17 00:00:00 2001
From: Amit Mahajan <amitmahajan@google.com>
Date: Fri, 3 Feb 2017 17:09:59 -0800
Subject: Make all fields except the 'apn' field read-only for VZW.

Test: Verified manually.
Bug: 34669991
Change-Id: I0c459b156b362fa75545c80cb6bdff1ffe55f339
---
 assets/carrier_config_20404.xml  | 16 +++++++++++++++-
 assets/carrier_config_310004.xml | 16 +++++++++++++++-
 assets/carrier_config_311480.xml | 16 +++++++++++++++-
 3 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/assets/carrier_config_20404.xml b/assets/carrier_config_20404.xml
index 787f65b..e1ceb34 100644
--- a/assets/carrier_config_20404.xml
+++ b/assets/carrier_config_20404.xml
@@ -14,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_310004.xml b/assets/carrier_config_310004.xml
index 2c92a7e..a0adfbd 100644
--- a/assets/carrier_config_310004.xml
+++ b/assets/carrier_config_310004.xml
@@ -33,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_311480.xml b/assets/carrier_config_311480.xml
index c67690e..76887a4 100644
--- a/assets/carrier_config_311480.xml
+++ b/assets/carrier_config_311480.xml
@@ -64,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" />
-- 
cgit v1.2.3