Merge tag 'android-6.0.1_r3' into 601r3
Android 6.0.1 release 3
* tag 'android-6.0.1_r3':
IMS: Enable check for GBA support on T-Mobile's SIMs
Adding config to allow/disallow user to add APNs.
Change-Id: Ifc4df4310414dcd1cc7e42dc2a4baaa252c17ec7
diff --git a/assets/carrier_config_20404.xml b/assets/carrier_config_20404.xml
index 0610bd0..9872cc6 100644
--- a/assets/carrier_config_20404.xml
+++ b/assets/carrier_config_20404.xml
@@ -5,4 +5,7 @@
<int name="maxMessageSize" value="1048576" />
<int name="maxImageWidth" value="2592" />
</carrier_config>
+ <carrier_config gid1="BAE0000000000000">
+ <boolean name="allow_adding_apns_bool" value="false" />
+ </carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_310004.xml b/assets/carrier_config_310004.xml
index 4a5757e..4a3bd33 100644
--- a/assets/carrier_config_310004.xml
+++ b/assets/carrier_config_310004.xml
@@ -24,5 +24,6 @@
<int name="volte_replacement_rat_int" value="6" />
<boolean name="enabledNotifyWapMMSC" value="true" />
<boolean name="enableMultipartSMS" value="true" />
+ <boolean name="allow_adding_apns_bool" value="false" />
</carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_310160.xml b/assets/carrier_config_310160.xml
index 15634c3..67841e6 100644
--- a/assets/carrier_config_310160.xml
+++ b/assets/carrier_config_310160.xml
@@ -8,5 +8,6 @@
<string name="vvm_type_string">vvm_type_cvvm</string>
<boolean name="carrier_volte_tty_supported_bool" value="false" />
<boolean name="carrier_wfc_ims_available_bool" value="true" />
+<boolean name="carrier_ims_gba_required_bool" value="true" />
</carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_310200.xml b/assets/carrier_config_310200.xml
index 26f82c3..21641b2 100644
--- a/assets/carrier_config_310200.xml
+++ b/assets/carrier_config_310200.xml
@@ -4,5 +4,6 @@
<boolean name="carrier_volte_available_bool" value="true" />
<boolean name="carrier_volte_tty_supported_bool" value="false" />
<boolean name="carrier_wfc_ims_available_bool" value="true" />
+<boolean name="carrier_ims_gba_required_bool" value="true" />
</carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_310210.xml b/assets/carrier_config_310210.xml
index 26f82c3..21641b2 100644
--- a/assets/carrier_config_310210.xml
+++ b/assets/carrier_config_310210.xml
@@ -4,5 +4,6 @@
<boolean name="carrier_volte_available_bool" value="true" />
<boolean name="carrier_volte_tty_supported_bool" value="false" />
<boolean name="carrier_wfc_ims_available_bool" value="true" />
+<boolean name="carrier_ims_gba_required_bool" value="true" />
</carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_310220.xml b/assets/carrier_config_310220.xml
index 26f82c3..21641b2 100644
--- a/assets/carrier_config_310220.xml
+++ b/assets/carrier_config_310220.xml
@@ -4,5 +4,6 @@
<boolean name="carrier_volte_available_bool" value="true" />
<boolean name="carrier_volte_tty_supported_bool" value="false" />
<boolean name="carrier_wfc_ims_available_bool" value="true" />
+<boolean name="carrier_ims_gba_required_bool" value="true" />
</carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_310230.xml b/assets/carrier_config_310230.xml
index 26f82c3..21641b2 100644
--- a/assets/carrier_config_310230.xml
+++ b/assets/carrier_config_310230.xml
@@ -4,5 +4,6 @@
<boolean name="carrier_volte_available_bool" value="true" />
<boolean name="carrier_volte_tty_supported_bool" value="false" />
<boolean name="carrier_wfc_ims_available_bool" value="true" />
+<boolean name="carrier_ims_gba_required_bool" value="true" />
</carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_310240.xml b/assets/carrier_config_310240.xml
index 26f82c3..21641b2 100644
--- a/assets/carrier_config_310240.xml
+++ b/assets/carrier_config_310240.xml
@@ -4,5 +4,6 @@
<boolean name="carrier_volte_available_bool" value="true" />
<boolean name="carrier_volte_tty_supported_bool" value="false" />
<boolean name="carrier_wfc_ims_available_bool" value="true" />
+<boolean name="carrier_ims_gba_required_bool" value="true" />
</carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_310250.xml b/assets/carrier_config_310250.xml
index 26f82c3..21641b2 100644
--- a/assets/carrier_config_310250.xml
+++ b/assets/carrier_config_310250.xml
@@ -4,5 +4,6 @@
<boolean name="carrier_volte_available_bool" value="true" />
<boolean name="carrier_volte_tty_supported_bool" value="false" />
<boolean name="carrier_wfc_ims_available_bool" value="true" />
+<boolean name="carrier_ims_gba_required_bool" value="true" />
</carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_310260.xml b/assets/carrier_config_310260.xml
index 2ac0155..51823a0 100644
--- a/assets/carrier_config_310260.xml
+++ b/assets/carrier_config_310260.xml
@@ -12,5 +12,6 @@
<int name="maxImageWidth" value="2592" />
<int name="volte_replacement_rat_int" value="3" />
<boolean name="carrier_wfc_ims_available_bool" value="true" />
+<boolean name="carrier_ims_gba_required_bool" value="true" />
</carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_310270.xml b/assets/carrier_config_310270.xml
index 26f82c3..21641b2 100644
--- a/assets/carrier_config_310270.xml
+++ b/assets/carrier_config_310270.xml
@@ -4,5 +4,6 @@
<boolean name="carrier_volte_available_bool" value="true" />
<boolean name="carrier_volte_tty_supported_bool" value="false" />
<boolean name="carrier_wfc_ims_available_bool" value="true" />
+<boolean name="carrier_ims_gba_required_bool" value="true" />
</carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_310310.xml b/assets/carrier_config_310310.xml
index 26f82c3..21641b2 100644
--- a/assets/carrier_config_310310.xml
+++ b/assets/carrier_config_310310.xml
@@ -4,5 +4,6 @@
<boolean name="carrier_volte_available_bool" value="true" />
<boolean name="carrier_volte_tty_supported_bool" value="false" />
<boolean name="carrier_wfc_ims_available_bool" value="true" />
+<boolean name="carrier_ims_gba_required_bool" value="true" />
</carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_310490.xml b/assets/carrier_config_310490.xml
index c34c891..979cb59 100644
--- a/assets/carrier_config_310490.xml
+++ b/assets/carrier_config_310490.xml
@@ -11,5 +11,6 @@
<int name="maxMessageSize" value="1048576" />
<int name="maxImageWidth" value="2592" />
<boolean name="carrier_wfc_ims_available_bool" value="true" />
+<boolean name="carrier_ims_gba_required_bool" value="true" />
</carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_310580.xml b/assets/carrier_config_310580.xml
index 5752167..cd67e65 100644
--- a/assets/carrier_config_310580.xml
+++ b/assets/carrier_config_310580.xml
@@ -14,5 +14,6 @@
<boolean name="enabledMMS" value="true" />
<boolean name="enableMultipartSMS" value="true" />
<boolean name="carrier_wfc_ims_available_bool" value="true" />
+<boolean name="carrier_ims_gba_required_bool" value="true" />
</carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_310660.xml b/assets/carrier_config_310660.xml
index 26f82c3..21641b2 100644
--- a/assets/carrier_config_310660.xml
+++ b/assets/carrier_config_310660.xml
@@ -4,5 +4,6 @@
<boolean name="carrier_volte_available_bool" value="true" />
<boolean name="carrier_volte_tty_supported_bool" value="false" />
<boolean name="carrier_wfc_ims_available_bool" value="true" />
+<boolean name="carrier_ims_gba_required_bool" value="true" />
</carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_310800.xml b/assets/carrier_config_310800.xml
index 26f82c3..21641b2 100644
--- a/assets/carrier_config_310800.xml
+++ b/assets/carrier_config_310800.xml
@@ -4,5 +4,6 @@
<boolean name="carrier_volte_available_bool" value="true" />
<boolean name="carrier_volte_tty_supported_bool" value="false" />
<boolean name="carrier_wfc_ims_available_bool" value="true" />
+<boolean name="carrier_ims_gba_required_bool" value="true" />
</carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_311480.xml b/assets/carrier_config_311480.xml
index 5348b8b..949f121 100644
--- a/assets/carrier_config_311480.xml
+++ b/assets/carrier_config_311480.xml
@@ -29,5 +29,6 @@
<int name="volte_replacement_rat_int" value="6" />
<boolean name="enabledNotifyWapMMSC" value="true" />
<boolean name="enableMultipartSMS" value="true" />
+ <boolean name="allow_adding_apns_bool" value="false" />
</carrier_config>
</carrier_config_list>