diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index b068c1fe358ab..346339730865e 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -2300,21 +2300,6 @@ SUPL_MODE=1 - - - 0 diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index bbe5ebee472d7..81c5e2b1c3638 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -2264,7 +2264,6 @@ - diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 4dcc7d583b323..c19febfec99c3 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -285,6 +285,14 @@ public class CarrierConfigManager { public static final String KEY_SUPPORT_DOWNGRADE_VT_TO_AUDIO_BOOL = "support_downgrade_vt_to_audio_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 @@ -1042,6 +1050,7 @@ public class CarrierConfigManager { sDefaults.putBoolean(KEY_CARRIER_VT_AVAILABLE_BOOL, false); sDefaults.putBoolean(KEY_NOTIFY_HANDOVER_VIDEO_FROM_WIFI_TO_LTE_BOOL, false); sDefaults.putBoolean(KEY_SUPPORT_DOWNGRADE_VT_TO_AUDIO_BOOL, true); + 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);