Move Telephony overlay config to CarrierConfig
The variable disable_cdma_activation_code_bool is overridden on shamu
for three specific VZW networks, but the overrides have been moved to
vendor/moto/shamu. They can be deleted from here.
Note: 310304 was supposed to be 310004 (corrected in vendor/moto/shamu)
and 20404 was only supposed to apply for a specific gid1.
Bug: 22229196
Bug: 21618018
Change-Id: I7b4e78480d054daf595f856dab3ffa18979f8f54
diff --git a/assets/carrier_config_20404.xml b/assets/carrier_config_20404.xml
index 11e7aac..0610bd0 100644
--- a/assets/carrier_config_20404.xml
+++ b/assets/carrier_config_20404.xml
@@ -1,7 +1,6 @@
<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
<carrier_config_list>
<carrier_config>
- <boolean name="disable_cdma_activation_code_bool" value="true" />
<int name="maxImageHeight" value="1944" />
<int name="maxMessageSize" value="1048576" />
<int name="maxImageWidth" value="2592" />
diff --git a/assets/carrier_config_310304.xml b/assets/carrier_config_310304.xml
deleted file mode 100644
index 71c94f4..0000000
--- a/assets/carrier_config_310304.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
-<carrier_config_list>
-<carrier_config>
-<boolean name="disable_cdma_activation_code_bool" value="true" />
-</carrier_config>
-</carrier_config_list>
diff --git a/assets/carrier_config_311480.xml b/assets/carrier_config_311480.xml
index 6a39f77..430883a 100644
--- a/assets/carrier_config_311480.xml
+++ b/assets/carrier_config_311480.xml
@@ -3,7 +3,6 @@
<carrier_config>
<boolean name="carrier_volte_provisioning_required_bool" value="true" />
<boolean name="operator_selection_expand_bool" value="true" />
- <boolean name="disable_cdma_activation_code_bool" value="true" />
<int name="aliasMinChars" value="2" />
<boolean name="dtmf_type_enabled_bool" value="true" />
<int name="smsToMmsTextThreshold" value="7" />