Renaming carrier config variable keys.

API council advised us to use KEY_NAME_TYPE for our key constants.

Bug: 21571894
Change-Id: I037a8b4f17d57a34da54a4f49372d86a0f1c25af

1 files changed, 164 insertions, 164 deletions

diff --git a/src/com/android/carrierconfig/DefaultCarrierConfigService.java b/src/com/android/carrierconfig/DefaultCarrierConfigService.java
index 1a78453..6a6a35f 100644
--- a/src/com/android/carrierconfig/DefaultCarrierConfigService.java
+++ b/src/com/android/carrierconfig/DefaultCarrierConfigService.java
@@ -97,180 +97,180 @@ public class DefaultCarrierConfigService extends CarrierService {
         PersistableBundle config311588 = new PersistableBundle();
         PersistableBundle config311589 = new PersistableBundle();
 
-        config001001.putBoolean(CarrierConfigManager.BOOL_CARRIER_VOLTE_AVAILABLE, true);
-        config00101.putBoolean(CarrierConfigManager.BOOL_SHOW_APN_SETTING_CDMA, true);
-        config001010.putBoolean(CarrierConfigManager.BOOL_CARRIER_VOLTE_AVAILABLE, true);
-        config001010.putBoolean(CarrierConfigManager.BOOL_SHOW_APN_SETTING_CDMA, true);
-        config20404.putBoolean(CarrierConfigManager.BOOL_DISABLE_CDMA_ACTIVATION_CODE, true);
-        config20801.putInt(CarrierConfigManager.INT_VVM_PORT_NUMBER, 20481);
-        config20801.putString(CarrierConfigManager.STRING_VVM_DESTINATION_NUMBER, "21101");
-        config20801.putString(CarrierConfigManager.STRING_VVM_TYPE,
+        config001001.putBoolean(CarrierConfigManager.KEY_CARRIER_VOLTE_AVAILABLE_BOOL, true);
+        config00101.putBoolean(CarrierConfigManager.KEY_SHOW_APN_SETTING_CDMA_BOOL, true);
+        config001010.putBoolean(CarrierConfigManager.KEY_CARRIER_VOLTE_AVAILABLE_BOOL, true);
+        config001010.putBoolean(CarrierConfigManager.KEY_SHOW_APN_SETTING_CDMA_BOOL, true);
+        config20404.putBoolean(CarrierConfigManager.KEY_DISABLE_CDMA_ACTIVATION_CODE_BOOL, true);
+        config20801.putInt(CarrierConfigManager.KEY_VVM_PORT_NUMBER_INT, 20481);
+        config20801.putString(CarrierConfigManager.KEY_VVM_DESTINATION_NUMBER_STRING, "21101");
+        config20801.putString(CarrierConfigManager.KEY_VVM_TYPE_STRING,
                 TelephonyManager.VVM_TYPE_OMTP);
-        config20802.putInt(CarrierConfigManager.INT_VVM_PORT_NUMBER, 20481);
-        config20802.putString(CarrierConfigManager.STRING_VVM_DESTINATION_NUMBER, "21101");
-        config20802.putString(CarrierConfigManager.STRING_VVM_TYPE,
+        config20802.putInt(CarrierConfigManager.KEY_VVM_PORT_NUMBER_INT, 20481);
+        config20802.putString(CarrierConfigManager.KEY_VVM_DESTINATION_NUMBER_STRING, "21101");
+        config20802.putString(CarrierConfigManager.KEY_VVM_TYPE_STRING,
                 TelephonyManager.VVM_TYPE_OMTP);
-        config23402.putBoolean(CarrierConfigManager.BOOL_PREFER_2G, false);
-        config23410.putBoolean(CarrierConfigManager.BOOL_PREFER_2G, false);
-        config23411.putBoolean(CarrierConfigManager.BOOL_PREFER_2G, false);
-        config23433.putInt(CarrierConfigManager.INT_VVM_PORT_NUMBER, 20481);
-        config23433.putString(CarrierConfigManager.STRING_VVM_DESTINATION_NUMBER, "887");
-        config23433.putString(CarrierConfigManager.STRING_VVM_TYPE,
+        config23402.putBoolean(CarrierConfigManager.KEY_PREFER_2G_BOOL, false);
+        config23410.putBoolean(CarrierConfigManager.KEY_PREFER_2G_BOOL, false);
+        config23411.putBoolean(CarrierConfigManager.KEY_PREFER_2G_BOOL, false);
+        config23433.putInt(CarrierConfigManager.KEY_VVM_PORT_NUMBER_INT, 20481);
+        config23433.putString(CarrierConfigManager.KEY_VVM_DESTINATION_NUMBER_STRING, "887");
+        config23433.putString(CarrierConfigManager.KEY_VVM_TYPE_STRING,
                 TelephonyManager.VVM_TYPE_OMTP);
-        config23434.putInt(CarrierConfigManager.INT_VVM_PORT_NUMBER, 20481);
-        config23434.putString(CarrierConfigManager.STRING_VVM_DESTINATION_NUMBER, "887");
-        config23434.putString(CarrierConfigManager.STRING_VVM_TYPE,
+        config23434.putInt(CarrierConfigManager.KEY_VVM_PORT_NUMBER_INT, 20481);
+        config23434.putString(CarrierConfigManager.KEY_VVM_DESTINATION_NUMBER_STRING, "887");
+        config23434.putString(CarrierConfigManager.KEY_VVM_TYPE_STRING,
                 TelephonyManager.VVM_TYPE_OMTP);
-        config246081.putBoolean(CarrierConfigManager.BOOL_SHOW_APN_SETTING_CDMA, true);
-        config310004.putBoolean(CarrierConfigManager.BOOL_APN_EXPAND, false);
-        config310004.putBoolean(CarrierConfigManager.BOOL_OPERATOR_SELECTION_EXPAND, true);
-        config310004.putBoolean(CarrierConfigManager.BOOL_PREFER_2G, false);
-        config310004.putBoolean(CarrierConfigManager.BOOL_SUPPORT_SWAP_AFTER_MERGE, false);
-        config310004.putBoolean(CarrierConfigManager.BOOL_VOICEMAIL_NOTIFICATION_PERSISTENT, true);
-        config310004.putInt(CarrierConfigManager.INT_VOLTE_REPLACEMENT_RAT, 6);
-        config310005.putBoolean(CarrierConfigManager.BOOL_APN_EXPAND, false);
-        config310005.putBoolean(CarrierConfigManager.BOOL_OPERATOR_SELECTION_EXPAND, true);
-        config310005.putBoolean(CarrierConfigManager.BOOL_PREFER_2G, false);
-        config310012.putBoolean(CarrierConfigManager.BOOL_APN_EXPAND, false);
-        config310012.putBoolean(CarrierConfigManager.BOOL_OPERATOR_SELECTION_EXPAND, true);
-        config310012.putBoolean(CarrierConfigManager.BOOL_PREFER_2G, false);
-        config310028.putBoolean(CarrierConfigManager.BOOL_CARRIER_VOLTE_AVAILABLE, true);
-        config310028.putBoolean(CarrierConfigManager.BOOL_SHOW_APN_SETTING_CDMA, true);
-        config310028.putInt(CarrierConfigManager.INT_VOLTE_REPLACEMENT_RAT, 6);
-        config310120.putBoolean(CarrierConfigManager.BOOL_APN_EXPAND, false);
-        config310120.putBoolean(CarrierConfigManager.BOOL_CARRIER_SETTINGS_ENABLE, true);
-        config310120.putBoolean(CarrierConfigManager.BOOL_DTMF_TYPE_ENABLED, true);
-        config310120.putBoolean(CarrierConfigManager.BOOL_SHOW_CDMA_CHOICES, true);
-        config310120.putBoolean(CarrierConfigManager.BOOL_SUPPORT_SWAP_AFTER_MERGE, false);
-        config310120.putBoolean(CarrierConfigManager.BOOL_USE_HFA_FOR_PROVISIONING, true);
-        config310120.putBoolean(CarrierConfigManager.BOOL_VOICEMAIL_NOTIFICATION_PERSISTENT, true);
-        config310120.putInt(CarrierConfigManager.INT_VOLTE_REPLACEMENT_RAT, 6);
-        config310160.putBoolean(CarrierConfigManager.BOOL_CARRIER_VOLTE_AVAILABLE, true);
-        config310160.putBoolean(CarrierConfigManager.BOOL_CARRIER_VOLTE_TTY_SUPPORTED, false);
-        config310160.putInt(CarrierConfigManager.INT_VVM_PORT_NUMBER, 1808);
-        config310160.putString(CarrierConfigManager.STRING_VVM_DESTINATION_NUMBER, "122");
-        config310160.putString(CarrierConfigManager.STRING_VVM_TYPE,
+        config246081.putBoolean(CarrierConfigManager.KEY_SHOW_APN_SETTING_CDMA_BOOL, true);
+        config310004.putBoolean(CarrierConfigManager.KEY_APN_EXPAND_BOOL, false);
+        config310004.putBoolean(CarrierConfigManager.KEY_OPERATOR_SELECTION_EXPAND_BOOL, true);
+        config310004.putBoolean(CarrierConfigManager.KEY_PREFER_2G_BOOL, false);
+        config310004.putBoolean(CarrierConfigManager.KEY_SUPPORT_SWAP_AFTER_MERGE_BOOL, false);
+        config310004.putBoolean(CarrierConfigManager.KEY_VOICEMAIL_NOTIFICATION_PERSISTENT_BOOL, true);
+        config310004.putInt(CarrierConfigManager.KEY_VOLTE_REPLACEMENT_RAT_INT, 6);
+        config310005.putBoolean(CarrierConfigManager.KEY_APN_EXPAND_BOOL, false);
+        config310005.putBoolean(CarrierConfigManager.KEY_OPERATOR_SELECTION_EXPAND_BOOL, true);
+        config310005.putBoolean(CarrierConfigManager.KEY_PREFER_2G_BOOL, false);
+        config310012.putBoolean(CarrierConfigManager.KEY_APN_EXPAND_BOOL, false);
+        config310012.putBoolean(CarrierConfigManager.KEY_OPERATOR_SELECTION_EXPAND_BOOL, true);
+        config310012.putBoolean(CarrierConfigManager.KEY_PREFER_2G_BOOL, false);
+        config310028.putBoolean(CarrierConfigManager.KEY_CARRIER_VOLTE_AVAILABLE_BOOL, true);
+        config310028.putBoolean(CarrierConfigManager.KEY_SHOW_APN_SETTING_CDMA_BOOL, true);
+        config310028.putInt(CarrierConfigManager.KEY_VOLTE_REPLACEMENT_RAT_INT, 6);
+        config310120.putBoolean(CarrierConfigManager.KEY_APN_EXPAND_BOOL, false);
+        config310120.putBoolean(CarrierConfigManager.KEY_CARRIER_SETTINGS_ENABLE_BOOL, true);
+        config310120.putBoolean(CarrierConfigManager.KEY_DTMF_TYPE_ENABLED_BOOL, true);
+        config310120.putBoolean(CarrierConfigManager.KEY_SHOW_CDMA_CHOICES_BOOL, true);
+        config310120.putBoolean(CarrierConfigManager.KEY_SUPPORT_SWAP_AFTER_MERGE_BOOL, false);
+        config310120.putBoolean(CarrierConfigManager.KEY_USE_HFA_FOR_PROVISIONING_BOOL, true);
+        config310120.putBoolean(CarrierConfigManager.KEY_VOICEMAIL_NOTIFICATION_PERSISTENT_BOOL, true);
+        config310120.putInt(CarrierConfigManager.KEY_VOLTE_REPLACEMENT_RAT_INT, 6);
+        config310160.putBoolean(CarrierConfigManager.KEY_CARRIER_VOLTE_AVAILABLE_BOOL, true);
+        config310160.putBoolean(CarrierConfigManager.KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL, false);
+        config310160.putInt(CarrierConfigManager.KEY_VVM_PORT_NUMBER_INT, 1808);
+        config310160.putString(CarrierConfigManager.KEY_VVM_DESTINATION_NUMBER_STRING, "122");
+        config310160.putString(CarrierConfigManager.KEY_VVM_TYPE_STRING,
                 TelephonyManager.VVM_TYPE_CVVM);
-        config310160.putString(CarrierConfigManager.STRING_CARRIER_VVM_PACKAGE_NAME,
+        config310160.putString(CarrierConfigManager.KEY_CARRIER_VVM_PACKAGE_NAME_STRING,
                 "com.tmobile.vvm.application");
-        config310200.putBoolean(CarrierConfigManager.BOOL_CARRIER_VOLTE_AVAILABLE, true);
-        config310200.putBoolean(CarrierConfigManager.BOOL_CARRIER_VOLTE_TTY_SUPPORTED, false);
-        config310210.putBoolean(CarrierConfigManager.BOOL_CARRIER_VOLTE_AVAILABLE, true);
-        config310210.putBoolean(CarrierConfigManager.BOOL_CARRIER_VOLTE_TTY_SUPPORTED, false);
-        config310220.putBoolean(CarrierConfigManager.BOOL_CARRIER_VOLTE_AVAILABLE, true);
-        config310220.putBoolean(CarrierConfigManager.BOOL_CARRIER_VOLTE_TTY_SUPPORTED, false);
-        config310230.putBoolean(CarrierConfigManager.BOOL_CARRIER_VOLTE_AVAILABLE, true);
-        config310230.putBoolean(CarrierConfigManager.BOOL_CARRIER_VOLTE_TTY_SUPPORTED, false);
-        config310240.putBoolean(CarrierConfigManager.BOOL_CARRIER_VOLTE_AVAILABLE, true);
-        config310240.putBoolean(CarrierConfigManager.BOOL_CARRIER_VOLTE_TTY_SUPPORTED, false);
-        config310250.putBoolean(CarrierConfigManager.BOOL_CARRIER_VOLTE_AVAILABLE, true);
-        config310250.putBoolean(CarrierConfigManager.BOOL_CARRIER_VOLTE_TTY_SUPPORTED, false);
-        config310260.putBoolean(CarrierConfigManager.BOOL_CARRIER_VOLTE_AVAILABLE, true);
-        config310260.putBoolean(CarrierConfigManager.BOOL_CARRIER_VOLTE_TTY_SUPPORTED, false);
-        config310260.putInt(CarrierConfigManager.INT_VOLTE_REPLACEMENT_RAT, 3);
-        config310260.putInt(CarrierConfigManager.INT_VVM_PORT_NUMBER, 1808);
-        config310260.putString(CarrierConfigManager.STRING_VVM_DESTINATION_NUMBER, "122");
-        config310260.putString(CarrierConfigManager.STRING_VVM_TYPE,
+        config310200.putBoolean(CarrierConfigManager.KEY_CARRIER_VOLTE_AVAILABLE_BOOL, true);
+        config310200.putBoolean(CarrierConfigManager.KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL, false);
+        config310210.putBoolean(CarrierConfigManager.KEY_CARRIER_VOLTE_AVAILABLE_BOOL, true);
+        config310210.putBoolean(CarrierConfigManager.KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL, false);
+        config310220.putBoolean(CarrierConfigManager.KEY_CARRIER_VOLTE_AVAILABLE_BOOL, true);
+        config310220.putBoolean(CarrierConfigManager.KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL, false);
+        config310230.putBoolean(CarrierConfigManager.KEY_CARRIER_VOLTE_AVAILABLE_BOOL, true);
+        config310230.putBoolean(CarrierConfigManager.KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL, false);
+        config310240.putBoolean(CarrierConfigManager.KEY_CARRIER_VOLTE_AVAILABLE_BOOL, true);
+        config310240.putBoolean(CarrierConfigManager.KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL, false);
+        config310250.putBoolean(CarrierConfigManager.KEY_CARRIER_VOLTE_AVAILABLE_BOOL, true);
+        config310250.putBoolean(CarrierConfigManager.KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL, false);
+        config310260.putBoolean(CarrierConfigManager.KEY_CARRIER_VOLTE_AVAILABLE_BOOL, true);
+        config310260.putBoolean(CarrierConfigManager.KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL, false);
+        config310260.putInt(CarrierConfigManager.KEY_VOLTE_REPLACEMENT_RAT_INT, 3);
+        config310260.putInt(CarrierConfigManager.KEY_VVM_PORT_NUMBER_INT, 1808);
+        config310260.putString(CarrierConfigManager.KEY_VVM_DESTINATION_NUMBER_STRING, "122");
+        config310260.putString(CarrierConfigManager.KEY_VVM_TYPE_STRING,
                 TelephonyManager.VVM_TYPE_CVVM);
-        config310260.putString(CarrierConfigManager.STRING_CARRIER_VVM_PACKAGE_NAME,
+        config310260.putString(CarrierConfigManager.KEY_CARRIER_VVM_PACKAGE_NAME_STRING,
                 "com.tmobile.vvm.application");
-        config310270.putBoolean(CarrierConfigManager.BOOL_CARRIER_VOLTE_AVAILABLE, true);
-        config310270.putBoolean(CarrierConfigManager.BOOL_CARRIER_VOLTE_TTY_SUPPORTED, false);
-        config310300.putBoolean(CarrierConfigManager.BOOL_CARRIER_VOLTE_AVAILABLE, true);
-        config310300.putBoolean(CarrierConfigManager.BOOL_CARRIER_VOLTE_TTY_SUPPORTED, false);
-        config310304.putBoolean(CarrierConfigManager.BOOL_DISABLE_CDMA_ACTIVATION_CODE, true);
-        config310310.putBoolean(CarrierConfigManager.BOOL_CARRIER_VOLTE_AVAILABLE, true);
-        config310310.putBoolean(CarrierConfigManager.BOOL_CARRIER_VOLTE_TTY_SUPPORTED, false);
-        config310410.putBoolean(CarrierConfigManager.BOOL_SUPPORT_PAUSE_IMS_VIDEO_CALLS, false);
-        config310410.putInt(CarrierConfigManager.INT_VOLTE_REPLACEMENT_RAT, 3);
-        config310490.putBoolean(CarrierConfigManager.BOOL_CARRIER_VOLTE_AVAILABLE, true);
-        config310490.putBoolean(CarrierConfigManager.BOOL_CARRIER_VOLTE_TTY_SUPPORTED, false);
-        config310490.putInt(CarrierConfigManager.INT_VVM_PORT_NUMBER, 1808);
-        config310490.putString(CarrierConfigManager.STRING_VVM_DESTINATION_NUMBER, "122");
-        config310490.putString(CarrierConfigManager.STRING_VVM_TYPE,
+        config310270.putBoolean(CarrierConfigManager.KEY_CARRIER_VOLTE_AVAILABLE_BOOL, true);
+        config310270.putBoolean(CarrierConfigManager.KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL, false);
+        config310300.putBoolean(CarrierConfigManager.KEY_CARRIER_VOLTE_AVAILABLE_BOOL, true);
+        config310300.putBoolean(CarrierConfigManager.KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL, false);
+        config310304.putBoolean(CarrierConfigManager.KEY_DISABLE_CDMA_ACTIVATION_CODE_BOOL, true);
+        config310310.putBoolean(CarrierConfigManager.KEY_CARRIER_VOLTE_AVAILABLE_BOOL, true);
+        config310310.putBoolean(CarrierConfigManager.KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL, false);
+        config310410.putBoolean(CarrierConfigManager.KEY_SUPPORT_PAUSE_IMS_VIDEO_CALLS_BOOL, false);
+        config310410.putInt(CarrierConfigManager.KEY_VOLTE_REPLACEMENT_RAT_INT, 3);
+        config310490.putBoolean(CarrierConfigManager.KEY_CARRIER_VOLTE_AVAILABLE_BOOL, true);
+        config310490.putBoolean(CarrierConfigManager.KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL, false);
+        config310490.putInt(CarrierConfigManager.KEY_VVM_PORT_NUMBER_INT, 1808);
+        config310490.putString(CarrierConfigManager.KEY_VVM_DESTINATION_NUMBER_STRING, "122");
+        config310490.putString(CarrierConfigManager.KEY_VVM_TYPE_STRING,
                 TelephonyManager.VVM_TYPE_CVVM);
-        config310490.putString(CarrierConfigManager.STRING_CARRIER_VVM_PACKAGE_NAME,
+        config310490.putString(CarrierConfigManager.KEY_CARRIER_VVM_PACKAGE_NAME_STRING,
                 "com.tmobile.vvm.application");
-        config310530.putBoolean(CarrierConfigManager.BOOL_CARRIER_VOLTE_AVAILABLE, true);
-        config310530.putBoolean(CarrierConfigManager.BOOL_CARRIER_VOLTE_TTY_SUPPORTED, false);
-        config310580.putBoolean(CarrierConfigManager.BOOL_CARRIER_VOLTE_AVAILABLE, true);
-        config310580.putBoolean(CarrierConfigManager.BOOL_CARRIER_VOLTE_TTY_SUPPORTED, false);
-        config310590.putBoolean(CarrierConfigManager.BOOL_CARRIER_VOLTE_AVAILABLE, true);
-        config310590.putBoolean(CarrierConfigManager.BOOL_CARRIER_VOLTE_TTY_SUPPORTED, false);
-        config310640.putBoolean(CarrierConfigManager.BOOL_CARRIER_VOLTE_AVAILABLE, true);
-        config310640.putBoolean(CarrierConfigManager.BOOL_CARRIER_VOLTE_TTY_SUPPORTED, false);
-        config310660.putBoolean(CarrierConfigManager.BOOL_CARRIER_VOLTE_AVAILABLE, true);
-        config310660.putBoolean(CarrierConfigManager.BOOL_CARRIER_VOLTE_TTY_SUPPORTED, false);
-        config310800.putBoolean(CarrierConfigManager.BOOL_CARRIER_VOLTE_AVAILABLE, true);
-        config310800.putBoolean(CarrierConfigManager.BOOL_CARRIER_VOLTE_TTY_SUPPORTED, false);
-        config311220.putBoolean(CarrierConfigManager.BOOL_DTMF_TYPE_ENABLED, true);
-        config311220.putBoolean(CarrierConfigManager.BOOL_SHOW_CDMA_CHOICES, true);
-        config311220.putBoolean(CarrierConfigManager.BOOL_USE_OTASP_FOR_PROVISIONING, true);
-        config311221.putBoolean(CarrierConfigManager.BOOL_SHOW_CDMA_CHOICES, true);
-        config311222.putBoolean(CarrierConfigManager.BOOL_SHOW_CDMA_CHOICES, true);
-        config311223.putBoolean(CarrierConfigManager.BOOL_SHOW_CDMA_CHOICES, true);
-        config311224.putBoolean(CarrierConfigManager.BOOL_SHOW_CDMA_CHOICES, true);
-        config311225.putBoolean(CarrierConfigManager.BOOL_SHOW_CDMA_CHOICES, true);
-        config311226.putBoolean(CarrierConfigManager.BOOL_SHOW_CDMA_CHOICES, true);
-        config311227.putBoolean(CarrierConfigManager.BOOL_SHOW_CDMA_CHOICES, true);
-        config311228.putBoolean(CarrierConfigManager.BOOL_SHOW_CDMA_CHOICES, true);
-        config311229.putBoolean(CarrierConfigManager.BOOL_SHOW_CDMA_CHOICES, true);
-        config311390.putBoolean(CarrierConfigManager.BOOL_CARRIER_VOLTE_AVAILABLE, true);
-        config311390.putBoolean(CarrierConfigManager.BOOL_DTMF_TYPE_ENABLED, true);
-        config311390.putBoolean(CarrierConfigManager.BOOL_SHOW_APN_SETTING_CDMA, true);
-        config311390.putInt(CarrierConfigManager.INT_VOLTE_REPLACEMENT_RAT, 6);
-        config311480.putBoolean(CarrierConfigManager.BOOL_APN_EXPAND, false);
-        config311480.putBoolean(CarrierConfigManager.BOOL_CARRIER_VOLTE_AVAILABLE, true);
-        config311480.putBoolean(CarrierConfigManager.BOOL_CARRIER_VOLTE_PROVISIONED, true);
-        config311480.putBoolean(CarrierConfigManager.BOOL_DISABLE_CDMA_ACTIVATION_CODE, true);
-        config311480.putBoolean(CarrierConfigManager.BOOL_DTMF_TYPE_ENABLED, true);
-        config311480.putBoolean(CarrierConfigManager.BOOL_OPERATOR_SELECTION_EXPAND, true);
-        config311480.putBoolean(CarrierConfigManager.BOOL_PREFER_2G, false);
-        config311480.putBoolean(CarrierConfigManager.BOOL_SUPPORT_PAUSE_IMS_VIDEO_CALLS, true);
-        config311480.putBoolean(CarrierConfigManager.BOOL_SUPPORT_SWAP_AFTER_MERGE, false);
-        config311480.putBoolean(CarrierConfigManager.BOOL_VOICEMAIL_NOTIFICATION_PERSISTENT, true);
-        config311480.putInt(CarrierConfigManager.INT_VOLTE_REPLACEMENT_RAT, 6);
-        config311481.putBoolean(CarrierConfigManager.BOOL_APN_EXPAND, false);
-        config311481.putBoolean(CarrierConfigManager.BOOL_OPERATOR_SELECTION_EXPAND, true);
-        config311481.putBoolean(CarrierConfigManager.BOOL_PREFER_2G, false);
-        config311482.putBoolean(CarrierConfigManager.BOOL_APN_EXPAND, false);
-        config311482.putBoolean(CarrierConfigManager.BOOL_OPERATOR_SELECTION_EXPAND, true);
-        config311482.putBoolean(CarrierConfigManager.BOOL_PREFER_2G, false);
-        config311483.putBoolean(CarrierConfigManager.BOOL_APN_EXPAND, false);
-        config311483.putBoolean(CarrierConfigManager.BOOL_OPERATOR_SELECTION_EXPAND, true);
-        config311483.putBoolean(CarrierConfigManager.BOOL_PREFER_2G, false);
-        config311484.putBoolean(CarrierConfigManager.BOOL_APN_EXPAND, false);
-        config311484.putBoolean(CarrierConfigManager.BOOL_OPERATOR_SELECTION_EXPAND, true);
-        config311484.putBoolean(CarrierConfigManager.BOOL_PREFER_2G, false);
-        config311485.putBoolean(CarrierConfigManager.BOOL_APN_EXPAND, false);
-        config311485.putBoolean(CarrierConfigManager.BOOL_OPERATOR_SELECTION_EXPAND, true);
-        config311485.putBoolean(CarrierConfigManager.BOOL_PREFER_2G, false);
-        config311486.putBoolean(CarrierConfigManager.BOOL_APN_EXPAND, false);
-        config311486.putBoolean(CarrierConfigManager.BOOL_OPERATOR_SELECTION_EXPAND, true);
-        config311486.putBoolean(CarrierConfigManager.BOOL_PREFER_2G, false);
-        config311487.putBoolean(CarrierConfigManager.BOOL_APN_EXPAND, false);
-        config311487.putBoolean(CarrierConfigManager.BOOL_OPERATOR_SELECTION_EXPAND, true);
-        config311487.putBoolean(CarrierConfigManager.BOOL_PREFER_2G, false);
-        config311488.putBoolean(CarrierConfigManager.BOOL_APN_EXPAND, false);
-        config311488.putBoolean(CarrierConfigManager.BOOL_OPERATOR_SELECTION_EXPAND, true);
-        config311488.putBoolean(CarrierConfigManager.BOOL_PREFER_2G, false);
-        config311489.putBoolean(CarrierConfigManager.BOOL_APN_EXPAND, false);
-        config311489.putBoolean(CarrierConfigManager.BOOL_OPERATOR_SELECTION_EXPAND, true);
-        config311489.putBoolean(CarrierConfigManager.BOOL_PREFER_2G, false);
-        config311490.putBoolean(CarrierConfigManager.BOOL_DTMF_TYPE_ENABLED, true);
-        config311490.putBoolean(CarrierConfigManager.BOOL_VOICEMAIL_NOTIFICATION_PERSISTENT, true);
-        config311580.putBoolean(CarrierConfigManager.BOOL_DTMF_TYPE_ENABLED, true);
-        config311580.putBoolean(CarrierConfigManager.BOOL_SHOW_CDMA_CHOICES, true);
-        config311580.putBoolean(CarrierConfigManager.BOOL_USE_OTASP_FOR_PROVISIONING, true);
-        config311581.putBoolean(CarrierConfigManager.BOOL_SHOW_CDMA_CHOICES, true);
-        config311582.putBoolean(CarrierConfigManager.BOOL_SHOW_CDMA_CHOICES, true);
-        config311583.putBoolean(CarrierConfigManager.BOOL_SHOW_CDMA_CHOICES, true);
-        config311584.putBoolean(CarrierConfigManager.BOOL_SHOW_CDMA_CHOICES, true);
-        config311585.putBoolean(CarrierConfigManager.BOOL_SHOW_CDMA_CHOICES, true);
-        config311586.putBoolean(CarrierConfigManager.BOOL_SHOW_CDMA_CHOICES, true);
-        config311587.putBoolean(CarrierConfigManager.BOOL_SHOW_CDMA_CHOICES, true);
-        config311588.putBoolean(CarrierConfigManager.BOOL_SHOW_CDMA_CHOICES, true);
-        config311589.putBoolean(CarrierConfigManager.BOOL_SHOW_CDMA_CHOICES, true);
+        config310530.putBoolean(CarrierConfigManager.KEY_CARRIER_VOLTE_AVAILABLE_BOOL, true);
+        config310530.putBoolean(CarrierConfigManager.KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL, false);
+        config310580.putBoolean(CarrierConfigManager.KEY_CARRIER_VOLTE_AVAILABLE_BOOL, true);
+        config310580.putBoolean(CarrierConfigManager.KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL, false);
+        config310590.putBoolean(CarrierConfigManager.KEY_CARRIER_VOLTE_AVAILABLE_BOOL, true);
+        config310590.putBoolean(CarrierConfigManager.KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL, false);
+        config310640.putBoolean(CarrierConfigManager.KEY_CARRIER_VOLTE_AVAILABLE_BOOL, true);
+        config310640.putBoolean(CarrierConfigManager.KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL, false);
+        config310660.putBoolean(CarrierConfigManager.KEY_CARRIER_VOLTE_AVAILABLE_BOOL, true);
+        config310660.putBoolean(CarrierConfigManager.KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL, false);
+        config310800.putBoolean(CarrierConfigManager.KEY_CARRIER_VOLTE_AVAILABLE_BOOL, true);
+        config310800.putBoolean(CarrierConfigManager.KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL, false);
+        config311220.putBoolean(CarrierConfigManager.KEY_DTMF_TYPE_ENABLED_BOOL, true);
+        config311220.putBoolean(CarrierConfigManager.KEY_SHOW_CDMA_CHOICES_BOOL, true);
+        config311220.putBoolean(CarrierConfigManager.KEY_USE_OTASP_FOR_PROVISIONING_BOOL, true);
+        config311221.putBoolean(CarrierConfigManager.KEY_SHOW_CDMA_CHOICES_BOOL, true);
+        config311222.putBoolean(CarrierConfigManager.KEY_SHOW_CDMA_CHOICES_BOOL, true);
+        config311223.putBoolean(CarrierConfigManager.KEY_SHOW_CDMA_CHOICES_BOOL, true);
+        config311224.putBoolean(CarrierConfigManager.KEY_SHOW_CDMA_CHOICES_BOOL, true);
+        config311225.putBoolean(CarrierConfigManager.KEY_SHOW_CDMA_CHOICES_BOOL, true);
+        config311226.putBoolean(CarrierConfigManager.KEY_SHOW_CDMA_CHOICES_BOOL, true);
+        config311227.putBoolean(CarrierConfigManager.KEY_SHOW_CDMA_CHOICES_BOOL, true);
+        config311228.putBoolean(CarrierConfigManager.KEY_SHOW_CDMA_CHOICES_BOOL, true);
+        config311229.putBoolean(CarrierConfigManager.KEY_SHOW_CDMA_CHOICES_BOOL, true);
+        config311390.putBoolean(CarrierConfigManager.KEY_CARRIER_VOLTE_AVAILABLE_BOOL, true);
+        config311390.putBoolean(CarrierConfigManager.KEY_DTMF_TYPE_ENABLED_BOOL, true);
+        config311390.putBoolean(CarrierConfigManager.KEY_SHOW_APN_SETTING_CDMA_BOOL, true);
+        config311390.putInt(CarrierConfigManager.KEY_VOLTE_REPLACEMENT_RAT_INT, 6);
+        config311480.putBoolean(CarrierConfigManager.KEY_APN_EXPAND_BOOL, false);
+        config311480.putBoolean(CarrierConfigManager.KEY_CARRIER_VOLTE_AVAILABLE_BOOL, true);
+        config311480.putBoolean(CarrierConfigManager.KEY_CARRIER_VOLTE_PROVISIONED_BOOL, true);
+        config311480.putBoolean(CarrierConfigManager.KEY_DISABLE_CDMA_ACTIVATION_CODE_BOOL, true);
+        config311480.putBoolean(CarrierConfigManager.KEY_DTMF_TYPE_ENABLED_BOOL, true);
+        config311480.putBoolean(CarrierConfigManager.KEY_OPERATOR_SELECTION_EXPAND_BOOL, true);
+        config311480.putBoolean(CarrierConfigManager.KEY_PREFER_2G_BOOL, false);
+        config311480.putBoolean(CarrierConfigManager.KEY_SUPPORT_PAUSE_IMS_VIDEO_CALLS_BOOL, true);
+        config311480.putBoolean(CarrierConfigManager.KEY_SUPPORT_SWAP_AFTER_MERGE_BOOL, false);
+        config311480.putBoolean(CarrierConfigManager.KEY_VOICEMAIL_NOTIFICATION_PERSISTENT_BOOL, true);
+        config311480.putInt(CarrierConfigManager.KEY_VOLTE_REPLACEMENT_RAT_INT, 6);
+        config311481.putBoolean(CarrierConfigManager.KEY_APN_EXPAND_BOOL, false);
+        config311481.putBoolean(CarrierConfigManager.KEY_OPERATOR_SELECTION_EXPAND_BOOL, true);
+        config311481.putBoolean(CarrierConfigManager.KEY_PREFER_2G_BOOL, false);
+        config311482.putBoolean(CarrierConfigManager.KEY_APN_EXPAND_BOOL, false);
+        config311482.putBoolean(CarrierConfigManager.KEY_OPERATOR_SELECTION_EXPAND_BOOL, true);
+        config311482.putBoolean(CarrierConfigManager.KEY_PREFER_2G_BOOL, false);
+        config311483.putBoolean(CarrierConfigManager.KEY_APN_EXPAND_BOOL, false);
+        config311483.putBoolean(CarrierConfigManager.KEY_OPERATOR_SELECTION_EXPAND_BOOL, true);
+        config311483.putBoolean(CarrierConfigManager.KEY_PREFER_2G_BOOL, false);
+        config311484.putBoolean(CarrierConfigManager.KEY_APN_EXPAND_BOOL, false);
+        config311484.putBoolean(CarrierConfigManager.KEY_OPERATOR_SELECTION_EXPAND_BOOL, true);
+        config311484.putBoolean(CarrierConfigManager.KEY_PREFER_2G_BOOL, false);
+        config311485.putBoolean(CarrierConfigManager.KEY_APN_EXPAND_BOOL, false);
+        config311485.putBoolean(CarrierConfigManager.KEY_OPERATOR_SELECTION_EXPAND_BOOL, true);
+        config311485.putBoolean(CarrierConfigManager.KEY_PREFER_2G_BOOL, false);
+        config311486.putBoolean(CarrierConfigManager.KEY_APN_EXPAND_BOOL, false);
+        config311486.putBoolean(CarrierConfigManager.KEY_OPERATOR_SELECTION_EXPAND_BOOL, true);
+        config311486.putBoolean(CarrierConfigManager.KEY_PREFER_2G_BOOL, false);
+        config311487.putBoolean(CarrierConfigManager.KEY_APN_EXPAND_BOOL, false);
+        config311487.putBoolean(CarrierConfigManager.KEY_OPERATOR_SELECTION_EXPAND_BOOL, true);
+        config311487.putBoolean(CarrierConfigManager.KEY_PREFER_2G_BOOL, false);
+        config311488.putBoolean(CarrierConfigManager.KEY_APN_EXPAND_BOOL, false);
+        config311488.putBoolean(CarrierConfigManager.KEY_OPERATOR_SELECTION_EXPAND_BOOL, true);
+        config311488.putBoolean(CarrierConfigManager.KEY_PREFER_2G_BOOL, false);
+        config311489.putBoolean(CarrierConfigManager.KEY_APN_EXPAND_BOOL, false);
+        config311489.putBoolean(CarrierConfigManager.KEY_OPERATOR_SELECTION_EXPAND_BOOL, true);
+        config311489.putBoolean(CarrierConfigManager.KEY_PREFER_2G_BOOL, false);
+        config311490.putBoolean(CarrierConfigManager.KEY_DTMF_TYPE_ENABLED_BOOL, true);
+        config311490.putBoolean(CarrierConfigManager.KEY_VOICEMAIL_NOTIFICATION_PERSISTENT_BOOL, true);
+        config311580.putBoolean(CarrierConfigManager.KEY_DTMF_TYPE_ENABLED_BOOL, true);
+        config311580.putBoolean(CarrierConfigManager.KEY_SHOW_CDMA_CHOICES_BOOL, true);
+        config311580.putBoolean(CarrierConfigManager.KEY_USE_OTASP_FOR_PROVISIONING_BOOL, true);
+        config311581.putBoolean(CarrierConfigManager.KEY_SHOW_CDMA_CHOICES_BOOL, true);
+        config311582.putBoolean(CarrierConfigManager.KEY_SHOW_CDMA_CHOICES_BOOL, true);
+        config311583.putBoolean(CarrierConfigManager.KEY_SHOW_CDMA_CHOICES_BOOL, true);
+        config311584.putBoolean(CarrierConfigManager.KEY_SHOW_CDMA_CHOICES_BOOL, true);
+        config311585.putBoolean(CarrierConfigManager.KEY_SHOW_CDMA_CHOICES_BOOL, true);
+        config311586.putBoolean(CarrierConfigManager.KEY_SHOW_CDMA_CHOICES_BOOL, true);
+        config311587.putBoolean(CarrierConfigManager.KEY_SHOW_CDMA_CHOICES_BOOL, true);
+        config311588.putBoolean(CarrierConfigManager.KEY_SHOW_CDMA_CHOICES_BOOL, true);
+        config311589.putBoolean(CarrierConfigManager.KEY_SHOW_CDMA_CHOICES_BOOL, true);
 
         sCarrierOverlays.put("001001", config001001);
         sCarrierOverlays.put("00101", config00101);