From 0dd2dfb5a12caadde090fdbab6dccdce285f5804 Mon Sep 17 00:00:00 2001 From: Saki Oomori Date: Tue, 11 Sep 2018 15:44:25 +0900 Subject: Add CarrierConfig of voicemail number for roaming and IMS unregistered This CarrierConfig is used to configure voicemail number while the device is both roaming and not registered for IMS. Bug: 118729539 Test: manual - Checked that voicemail number is changed according to KEY_DEFAULT_VM_NUMBER_ROAMING_AND_IMS_UNREGISTERED_STRING, when IMS is in unregistered state, and network is roaming, and KEY_DEFAULT_VM_NUMBER_ROAMING_AND_IMS_UNREGISTERED_STRING is not empty. Change-Id: I16bfe697c6ffa01be9f00695e8c4524686c767d7 --- api/current.txt | 1 + telephony/java/android/telephony/CarrierConfigManager.java | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/api/current.txt b/api/current.txt index 1cfc86a33d21..0aa984872aea 100644 --- a/api/current.txt +++ b/api/current.txt @@ -44071,6 +44071,7 @@ package android.telephony { field public static final String KEY_DATA_LIMIT_THRESHOLD_BYTES_LONG = "data_limit_threshold_bytes_long"; field public static final String KEY_DATA_WARNING_THRESHOLD_BYTES_LONG = "data_warning_threshold_bytes_long"; field public static final String KEY_DEFAULT_SIM_CALL_MANAGER_STRING = "default_sim_call_manager_string"; + field public static final String KEY_DEFAULT_VM_NUMBER_ROAMING_AND_IMS_UNREGISTERED_STRING = "default_vm_number_roaming_and_ims_unregistered_string"; field public static final String KEY_DEFAULT_VM_NUMBER_STRING = "default_vm_number_string"; field public static final String KEY_DIAL_STRING_REPLACE_STRING_ARRAY = "dial_string_replace_string_array"; field public static final String KEY_DISABLE_CDMA_ACTIVATION_CODE_BOOL = "disable_cdma_activation_code_bool"; diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index f475822e9570..422c5bf53e21 100755 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -517,6 +517,15 @@ public class CarrierConfigManager { public static final String KEY_DEFAULT_VM_NUMBER_ROAMING_STRING = "default_vm_number_roaming_string"; + /** + * Where there is no preloaded voicemail number on a SIM card, specifies the carrier's default + * voicemail number while the device is both roaming and not registered for IMS. + * When empty string, no default voicemail number is specified for roaming network and + * unregistered state in IMS. + */ + public static final String KEY_DEFAULT_VM_NUMBER_ROAMING_AND_IMS_UNREGISTERED_STRING = + "default_vm_number_roaming_and_ims_unregistered_string"; + /** * Flag that specifies to use the user's own phone number as the voicemail number when there is * no pre-loaded voicemail number on the SIM card. @@ -3115,6 +3124,7 @@ public class CarrierConfigManager { sDefaults.putBoolean(KEY_SUPPORT_DOWNGRADE_VT_TO_AUDIO_BOOL, true); sDefaults.putString(KEY_DEFAULT_VM_NUMBER_STRING, ""); sDefaults.putString(KEY_DEFAULT_VM_NUMBER_ROAMING_STRING, ""); + sDefaults.putString(KEY_DEFAULT_VM_NUMBER_ROAMING_AND_IMS_UNREGISTERED_STRING, ""); sDefaults.putBoolean(KEY_CONFIG_TELEPHONY_USE_OWN_NUMBER_FOR_VOICEMAIL_BOOL, false); sDefaults.putBoolean(KEY_IGNORE_DATA_ENABLED_CHANGED_FOR_VIDEO_CALLS, true); sDefaults.putBoolean(KEY_VILTE_DATA_IS_METERED_BOOL, true); -- cgit v1.2.3-59-g8ed1b