summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Kondik <steve@cyngn.com>2016-03-11 02:22:12 (GMT)
committerSteve Kondik <steve@cyngn.com>2016-03-11 02:22:12 (GMT)
commit4f6ce6373a32483b7a42029cc889db1893634bd6 (patch)
tree3e3f00f64edcf650328444e26719960a4bd79467
parent7b25cb4dcc75c1072e20ecabafea525b6fab0099 (diff)
parent32a3bfad2532a6aaa94a55232c8212d2cbca721d (diff)
downloadandroid_packages_apps_CarrierConfig-4f6ce6373a32483b7a42029cc889db1893634bd6.zip
android_packages_apps_CarrierConfig-4f6ce6373a32483b7a42029cc889db1893634bd6.tar.gz
android_packages_apps_CarrierConfig-4f6ce6373a32483b7a42029cc889db1893634bd6.tar.bz2
Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/packages/apps/CarrierConfig into cm-13.0staging/cm-13.0+r22
Android 6.0.1 release 22
-rw-r--r--assets/carrier_config_20404.xml1
-rw-r--r--assets/carrier_config_310004.xml1
-rw-r--r--assets/carrier_config_311480.xml1
3 files changed, 3 insertions, 0 deletions
diff --git a/assets/carrier_config_20404.xml b/assets/carrier_config_20404.xml
index 9872cc6..dc0feb8 100644
--- a/assets/carrier_config_20404.xml
+++ b/assets/carrier_config_20404.xml
@@ -7,5 +7,6 @@
</carrier_config>
<carrier_config gid1="BAE0000000000000">
<boolean name="allow_adding_apns_bool" value="false" />
+ <boolean name="broadcast_emergency_call_state_changes_bool" value="true" />
</carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_310004.xml b/assets/carrier_config_310004.xml
index 4a3bd33..fba514e 100644
--- a/assets/carrier_config_310004.xml
+++ b/assets/carrier_config_310004.xml
@@ -25,5 +25,6 @@
<boolean name="enabledNotifyWapMMSC" value="true" />
<boolean name="enableMultipartSMS" value="true" />
<boolean name="allow_adding_apns_bool" value="false" />
+ <boolean name="broadcast_emergency_call_state_changes_bool" value="true" />
</carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_311480.xml b/assets/carrier_config_311480.xml
index 949f121..314c993 100644
--- a/assets/carrier_config_311480.xml
+++ b/assets/carrier_config_311480.xml
@@ -30,5 +30,6 @@
<boolean name="enabledNotifyWapMMSC" value="true" />
<boolean name="enableMultipartSMS" value="true" />
<boolean name="allow_adding_apns_bool" value="false" />
+ <boolean name="broadcast_emergency_call_state_changes_bool" value="true" />
</carrier_config>
</carrier_config_list>