diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index f909695610119..084f1a5f79deb 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -2194,21 +2194,6 @@ SUPL_MODE=1 - - - 0 diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index a51b29caa79c6..87b262f4d68c6 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -2233,7 +2233,6 @@ - diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 17f0da0c0b11c..d064cd9c79de7 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -261,6 +261,15 @@ public class CarrierConfigManager { */ public static final String KEY_CARRIER_VT_AVAILABLE_BOOL = "carrier_vt_available_bool"; + /** + * Where there is no preloaded voicemail number on a SIM card, specifies the carrier's default + * voicemail number. + * When empty string, no default voicemail number is specified. + * @hide + */ + public static final String KEY_DEFAULT_VM_NUMBER_STRING = "default_vm_number_string"; + + /** * Flag specifying whether WFC over IMS should be available for carrier: independent of * carrier provisioning. If false: hard disabled. If true: then depends on carrier @@ -768,6 +777,7 @@ public class CarrierConfigManager { sDefaults.putBoolean(KEY_CARRIER_SETTINGS_ENABLE_BOOL, false); sDefaults.putBoolean(KEY_CARRIER_VOLTE_AVAILABLE_BOOL, false); sDefaults.putBoolean(KEY_CARRIER_VT_AVAILABLE_BOOL, false); + sDefaults.putString(KEY_DEFAULT_VM_NUMBER_STRING, ""); sDefaults.putBoolean(KEY_CARRIER_WFC_IMS_AVAILABLE_BOOL, false); sDefaults.putBoolean(KEY_CARRIER_WFC_SUPPORTS_WIFI_ONLY_BOOL, false); sDefaults.putBoolean(KEY_CARRIER_DEFAULT_WFC_IMS_ENABLED_BOOL, false);