Move ci_action_on_sys_update_* carrier config to vendor directory.

Bug: 22093601
Change-Id: I187da9a992ae7571cfd27a2d3cf7b6ca4c2f9dbc

3 files changed, 61 insertions, 73 deletions

diff --git a/assets/carrier_config_20404.xml b/assets/carrier_config_20404.xml
index 37d92a3..11e7aac 100644
--- a/assets/carrier_config_20404.xml
+++ b/assets/carrier_config_20404.xml
@@ -1,13 +1,9 @@
 <?xml version='1.0' encoding='utf-8' standalone='yes' ?>
 <carrier_config_list>
-<carrier_config>
-<boolean name="disable_cdma_activation_code_bool" value="true" />
-<boolean name="ci_action_on_sys_update_bool" value="true" />
-<string name="ci_action_on_sys_update_extra_string">ServerID</string>
-<string name="ci_action_on_sys_update_intent_string">com.android.omadm.service.CONFIGURATION_UPDATE</string>
-<int name="maxImageHeight" value="1944" />
-<string name="ci_action_on_sys_update_extra_val_string">com.vzwdmserver</string>
-<int name="maxMessageSize" value="1048576" />
-<int name="maxImageWidth" value="2592" />
-</carrier_config>
+    <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" />
+    </carrier_config>
 </carrier_config_list>
diff --git a/assets/carrier_config_310004.xml b/assets/carrier_config_310004.xml
index 96875ad..4a5757e 100644
--- a/assets/carrier_config_310004.xml
+++ b/assets/carrier_config_310004.xml
@@ -1,32 +1,28 @@
 <?xml version='1.0' encoding='utf-8' standalone='yes' ?>
 <carrier_config_list>
-<carrier_config>
-<boolean name="operator_selection_expand_bool" value="true" />
-<int name="aliasMinChars" value="2" />
-<boolean name="ci_action_on_sys_update_bool" value="true" />
-<int name="smsToMmsTextThreshold" value="7" />
-<boolean name="enabledTransID" value="true" />
-<boolean name="aliasEnabled" value="true" />
-<boolean name="voicemail_notification_persistent_bool" value="true" />
-<boolean name="allowAttachAudio" value="false" />
-<string name="ci_action_on_sys_update_extra_string">ServerID</string>
-<string name="ci_action_on_sys_update_intent_string">com.android.omadm.service.CONFIGURATION_UPDATE</string>
-<boolean name="support_swap_after_merge_bool" value="false" />
-<int name="recipientLimit" value="20" />
-<string name="uaProfTagName">Profile</string>
-<int name="aliasMaxChars" value="48" />
-<int name="maxImageHeight" value="1944" />
-<string name="ci_action_on_sys_update_extra_val_string">com.vzwdmserver</string>
-<boolean name="apn_expand_bool" value="false" />
-<int name="maxSubjectLength" value="80" />
-<string name="httpParams">x-up-calling-line-id: 1##LINE1NOCOUNTRYCODE##|X-VzW-MDN: 1##LINE1NOCOUNTRYCODE##</string>
-<string name="emailGatewayNumber">6245</string>
-<int name="maxMessageSize" value="1258291" />
-<boolean name="enableMMSReadReports" value="false" />
-<boolean name="prefer_2g_bool" value="false" />
-<int name="maxImageWidth" value="2592" />
-<int name="volte_replacement_rat_int" value="6" />
-<boolean name="enabledNotifyWapMMSC" value="true" />
-<boolean name="enableMultipartSMS" value="true" />
-</carrier_config>
+    <carrier_config>
+        <boolean name="operator_selection_expand_bool" value="true" />
+        <int name="aliasMinChars" value="2" />
+        <int name="smsToMmsTextThreshold" value="7" />
+        <boolean name="enabledTransID" value="true" />
+        <boolean name="aliasEnabled" value="true" />
+        <boolean name="voicemail_notification_persistent_bool" value="true" />
+        <boolean name="allowAttachAudio" value="false" />
+        <boolean name="support_swap_after_merge_bool" value="false" />
+        <int name="recipientLimit" value="20" />
+        <string name="uaProfTagName">Profile</string>
+        <int name="aliasMaxChars" value="48" />
+        <int name="maxImageHeight" value="1944" />
+        <boolean name="apn_expand_bool" value="false" />
+        <int name="maxSubjectLength" value="80" />
+        <string name="httpParams">x-up-calling-line-id: 1##LINE1NOCOUNTRYCODE##|X-VzW-MDN: 1##LINE1NOCOUNTRYCODE##</string>
+        <string name="emailGatewayNumber">6245</string>
+        <int name="maxMessageSize" value="1258291" />
+        <boolean name="enableMMSReadReports" value="false" />
+        <boolean name="prefer_2g_bool" value="false" />
+        <int name="maxImageWidth" value="2592" />
+        <int name="volte_replacement_rat_int" value="6" />
+        <boolean name="enabledNotifyWapMMSC" value="true" />
+        <boolean name="enableMultipartSMS" value="true" />
+    </carrier_config>
 </carrier_config_list>
diff --git a/assets/carrier_config_311480.xml b/assets/carrier_config_311480.xml
index 4463b2c..6a39f77 100644
--- a/assets/carrier_config_311480.xml
+++ b/assets/carrier_config_311480.xml
@@ -1,37 +1,33 @@
 <?xml version='1.0' encoding='utf-8' standalone='yes' ?>
 <carrier_config_list>
-<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="ci_action_on_sys_update_bool" value="true" />
-<boolean name="dtmf_type_enabled_bool" value="true" />
-<int name="smsToMmsTextThreshold" value="7" />
-<boolean name="enabledTransID" value="true" />
-<boolean name="aliasEnabled" value="true" />
-<boolean name="voicemail_notification_persistent_bool" value="true" />
-<boolean name="allowAttachAudio" value="false" />
-<string name="ci_action_on_sys_update_extra_string">ServerID</string>
-<string name="ci_action_on_sys_update_intent_string">com.android.omadm.service.CONFIGURATION_UPDATE</string>
-<boolean name="support_swap_after_merge_bool" value="false" />
-<int name="recipientLimit" value="20" />
-<string name="uaProfTagName">Profile</string>
-<int name="aliasMaxChars" value="48" />
-<int name="maxImageHeight" value="1944" />
-<boolean name="carrier_volte_available_bool" value="true" />
-<boolean name="support_pause_ims_video_calls_bool" value="true" />
-<string name="ci_action_on_sys_update_extra_val_string">com.vzwdmserver</string>
-<boolean name="apn_expand_bool" value="false" />
-<int name="maxSubjectLength" value="80" />
-<string name="httpParams">x-up-calling-line-id: 1##LINE1NOCOUNTRYCODE##|X-VzW-MDN: 1##LINE1NOCOUNTRYCODE##</string>
-<string name="emailGatewayNumber">6245</string>
-<int name="maxMessageSize" value="1258291" />
-<boolean name="enableMMSReadReports" value="false" />
-<boolean name="prefer_2g_bool" value="false" />
-<int name="maxImageWidth" value="2592" />
-<int name="volte_replacement_rat_int" value="6" />
-<boolean name="enabledNotifyWapMMSC" value="true" />
-<boolean name="enableMultipartSMS" value="true" />
-</carrier_config>
+    <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" />
+        <boolean name="enabledTransID" value="true" />
+        <boolean name="aliasEnabled" value="true" />
+        <boolean name="voicemail_notification_persistent_bool" value="true" />
+        <boolean name="allowAttachAudio" value="false" />
+        <boolean name="support_swap_after_merge_bool" value="false" />
+        <int name="recipientLimit" value="20" />
+        <string name="uaProfTagName">Profile</string>
+        <int name="aliasMaxChars" value="48" />
+        <int name="maxImageHeight" value="1944" />
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="support_pause_ims_video_calls_bool" value="true" />
+        <boolean name="apn_expand_bool" value="false" />
+        <int name="maxSubjectLength" value="80" />
+        <string name="httpParams">x-up-calling-line-id: 1##LINE1NOCOUNTRYCODE##|X-VzW-MDN: 1##LINE1NOCOUNTRYCODE##</string>
+        <string name="emailGatewayNumber">6245</string>
+        <int name="maxMessageSize" value="1258291" />
+        <boolean name="enableMMSReadReports" value="false" />
+        <boolean name="prefer_2g_bool" value="false" />
+        <int name="maxImageWidth" value="2592" />
+        <int name="volte_replacement_rat_int" value="6" />
+        <boolean name="enabledNotifyWapMMSC" value="true" />
+        <boolean name="enableMultipartSMS" value="true" />
+    </carrier_config>
 </carrier_config_list>