From 4c6f72cc1bb340d42e7b5e570635e147c62b1616 Mon Sep 17 00:00:00 2001 From: Cassie Date: Tue, 10 Oct 2017 14:33:38 -0700 Subject: [PATCH] Migrate flag config_telephony_use_own_number_for_voicemail to Carrier Config. Bug: 65683508 Test: Basic telephony sanity Change-Id: I3ff7d5726193a554a8154bd13bbfd347c89b6a99 --- api/current.txt | 1 + api/system-current.txt | 1 + api/test-current.txt | 1 + core/res/res/values/config.xml | 3 --- core/res/res/values/symbols.xml | 1 - .../java/android/telephony/CarrierConfigManager.java | 12 ++++++++++++ 6 files changed, 15 insertions(+), 4 deletions(-) diff --git a/api/current.txt b/api/current.txt index bb3b9e07f4862..9a01bd95efe5a 100644 --- a/api/current.txt +++ b/api/current.txt @@ -39883,6 +39883,7 @@ package android.telephony { field public static final java.lang.String KEY_CI_ACTION_ON_SYS_UPDATE_EXTRA_VAL_STRING = "ci_action_on_sys_update_extra_val_string"; field public static final java.lang.String KEY_CI_ACTION_ON_SYS_UPDATE_INTENT_STRING = "ci_action_on_sys_update_intent_string"; field public static final java.lang.String KEY_CONFIG_IMS_PACKAGE_OVERRIDE_STRING = "config_ims_package_override_string"; + field public static final java.lang.String KEY_CONFIG_TELEPHONY_USE_OWN_NUMBER_FOR_VOICEMAIL_BOOL = "config_telephony_use_own_number_for_voicemail_bool"; field public static final java.lang.String KEY_CSP_ENABLED_BOOL = "csp_enabled_bool"; field public static final java.lang.String KEY_DATA_LIMIT_THRESHOLD_BYTES_LONG = "data_limit_threshold_bytes_long"; field public static final java.lang.String KEY_DATA_WARNING_THRESHOLD_BYTES_LONG = "data_warning_threshold_bytes_long"; diff --git a/api/system-current.txt b/api/system-current.txt index 8fa8ff72e640a..370bce7af3e76 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -43399,6 +43399,7 @@ package android.telephony { field public static final java.lang.String KEY_CI_ACTION_ON_SYS_UPDATE_INTENT_STRING = "ci_action_on_sys_update_intent_string"; field public static final java.lang.String KEY_CONFIG_IMS_PACKAGE_OVERRIDE_STRING = "config_ims_package_override_string"; field public static final java.lang.String KEY_CONFIG_PLANS_PACKAGE_OVERRIDE_STRING = "config_plans_package_override_string"; + field public static final java.lang.String KEY_CONFIG_TELEPHONY_USE_OWN_NUMBER_FOR_VOICEMAIL_BOOL = "config_telephony_use_own_number_for_voicemail_bool"; field public static final java.lang.String KEY_CSP_ENABLED_BOOL = "csp_enabled_bool"; field public static final java.lang.String KEY_DATA_LIMIT_THRESHOLD_BYTES_LONG = "data_limit_threshold_bytes_long"; field public static final java.lang.String KEY_DATA_WARNING_THRESHOLD_BYTES_LONG = "data_warning_threshold_bytes_long"; diff --git a/api/test-current.txt b/api/test-current.txt index 9f709c6d81b9d..d88a23d3bdb91 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -40277,6 +40277,7 @@ package android.telephony { field public static final java.lang.String KEY_CI_ACTION_ON_SYS_UPDATE_EXTRA_VAL_STRING = "ci_action_on_sys_update_extra_val_string"; field public static final java.lang.String KEY_CI_ACTION_ON_SYS_UPDATE_INTENT_STRING = "ci_action_on_sys_update_intent_string"; field public static final java.lang.String KEY_CONFIG_IMS_PACKAGE_OVERRIDE_STRING = "config_ims_package_override_string"; + field public static final java.lang.String KEY_CONFIG_TELEPHONY_USE_OWN_NUMBER_FOR_VOICEMAIL_BOOL = "config_telephony_use_own_number_for_voicemail_bool"; field public static final java.lang.String KEY_CSP_ENABLED_BOOL = "csp_enabled_bool"; field public static final java.lang.String KEY_DATA_LIMIT_THRESHOLD_BYTES_LONG = "data_limit_threshold_bytes_long"; field public static final java.lang.String KEY_DATA_WARNING_THRESHOLD_BYTES_LONG = "data_warning_threshold_bytes_long"; diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index c2814d72ebe0c..4a8bc13f76698 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -1765,9 +1765,6 @@ - - false - false diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index f301644f8f89a..e513816e67433 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -273,7 +273,6 @@ - diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 47b0f79b29fcf..32db9f7118057 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -345,6 +345,17 @@ public class CarrierConfigManager { */ public static final String KEY_DEFAULT_VM_NUMBER_STRING = "default_vm_number_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. + *

+ * {@link #KEY_DEFAULT_VM_NUMBER_STRING} takes precedence over this flag. + *

+ * If false, the system default (*86) will be used instead. + */ + public static final String KEY_CONFIG_TELEPHONY_USE_OWN_NUMBER_FOR_VOICEMAIL_BOOL = + "config_telephony_use_own_number_for_voicemail_bool"; + /** * When {@code true}, changes to the mobile data enabled switch will not cause the VT * registration state to change. That is, turning on or off mobile data will not cause VT to be @@ -1639,6 +1650,7 @@ public class CarrierConfigManager { 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_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); sDefaults.putBoolean(KEY_CARRIER_WFC_IMS_AVAILABLE_BOOL, false);