From d245ba438c566286fdfba2eb3118d2f589084c27 Mon Sep 17 00:00:00 2001 From: "manabu, shimoda" Date: Fri, 20 Oct 2017 17:16:06 +0900 Subject: Add a carrier config indicating whether user can edit a voicemail number Some carriers require to make it possible to prevent user editing voicemail number. This carrier config is used to disable voicemail number setting in Settings. Test: manual - Checked that the voice mail number editing could be controlled by carrier config. Bug: 67872671 Merged-In: Ibbc3e0aa9d3d15abbb44477acd6d3546593a21bf Change-Id: Ibbc3e0aa9d3d15abbb44477acd6d3546593a21bf --- api/current.txt | 1 + api/system-current.txt | 1 + api/test-current.txt | 1 + telephony/java/android/telephony/CarrierConfigManager.java | 7 +++++++ 4 files changed, 10 insertions(+) diff --git a/api/current.txt b/api/current.txt index 518d972e8e1a..2c742a58fcc9 100644 --- a/api/current.txt +++ b/api/current.txt @@ -39524,6 +39524,7 @@ package android.telephony { field public static final java.lang.String KEY_DURATION_BLOCKING_DISABLED_AFTER_EMERGENCY_INT = "duration_blocking_disabled_after_emergency_int"; field public static final java.lang.String KEY_EDITABLE_ENHANCED_4G_LTE_BOOL = "editable_enhanced_4g_lte_bool"; field public static final java.lang.String KEY_EDITABLE_VOICEMAIL_NUMBER_BOOL = "editable_voicemail_number_bool"; + field public static final java.lang.String KEY_EDITABLE_VOICEMAIL_NUMBER_SETTING_BOOL = "editable_voicemail_number_setting_bool"; field public static final java.lang.String KEY_ENABLE_DIALER_KEY_VIBRATION_BOOL = "enable_dialer_key_vibration_bool"; field public static final java.lang.String KEY_FORCE_HOME_NETWORK_BOOL = "force_home_network_bool"; field public static final java.lang.String KEY_GSM_DTMF_TONE_DELAY_INT = "gsm_dtmf_tone_delay_int"; diff --git a/api/system-current.txt b/api/system-current.txt index 03fdf3a58e1b..d96f6e2e0bce 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -42955,6 +42955,7 @@ package android.telephony { field public static final java.lang.String KEY_DURATION_BLOCKING_DISABLED_AFTER_EMERGENCY_INT = "duration_blocking_disabled_after_emergency_int"; field public static final java.lang.String KEY_EDITABLE_ENHANCED_4G_LTE_BOOL = "editable_enhanced_4g_lte_bool"; field public static final java.lang.String KEY_EDITABLE_VOICEMAIL_NUMBER_BOOL = "editable_voicemail_number_bool"; + field public static final java.lang.String KEY_EDITABLE_VOICEMAIL_NUMBER_SETTING_BOOL = "editable_voicemail_number_setting_bool"; field public static final java.lang.String KEY_ENABLE_DIALER_KEY_VIBRATION_BOOL = "enable_dialer_key_vibration_bool"; field public static final java.lang.String KEY_FORCE_HOME_NETWORK_BOOL = "force_home_network_bool"; field public static final java.lang.String KEY_GSM_DTMF_TONE_DELAY_INT = "gsm_dtmf_tone_delay_int"; diff --git a/api/test-current.txt b/api/test-current.txt index 57c65813be9b..b7a0e7c9a679 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -39748,6 +39748,7 @@ package android.telephony { field public static final java.lang.String KEY_DURATION_BLOCKING_DISABLED_AFTER_EMERGENCY_INT = "duration_blocking_disabled_after_emergency_int"; field public static final java.lang.String KEY_EDITABLE_ENHANCED_4G_LTE_BOOL = "editable_enhanced_4g_lte_bool"; field public static final java.lang.String KEY_EDITABLE_VOICEMAIL_NUMBER_BOOL = "editable_voicemail_number_bool"; + field public static final java.lang.String KEY_EDITABLE_VOICEMAIL_NUMBER_SETTING_BOOL = "editable_voicemail_number_setting_bool"; field public static final java.lang.String KEY_ENABLE_DIALER_KEY_VIBRATION_BOOL = "enable_dialer_key_vibration_bool"; field public static final java.lang.String KEY_FORCE_HOME_NETWORK_BOOL = "force_home_network_bool"; field public static final java.lang.String KEY_GSM_DTMF_TONE_DELAY_INT = "gsm_dtmf_tone_delay_int"; diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 1d4a5cf504f4..8bf36aaf210e 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -208,6 +208,12 @@ public class CarrierConfigManager { /** After a CDMA conference call is merged, the swap button should be displayed. */ public static final String KEY_SUPPORT_SWAP_AFTER_MERGE_BOOL = "support_swap_after_merge_bool"; + /** + * Determine whether user can edit voicemail number in Settings. + */ + public static final String KEY_EDITABLE_VOICEMAIL_NUMBER_SETTING_BOOL = + "editable_voicemail_number_setting_bool"; + /** * Since the default voicemail number is empty, if a SIM card does not have a voicemail number * available the user cannot use voicemail. This flag allows the user to edit the voicemail @@ -1652,6 +1658,7 @@ public class CarrierConfigManager { sDefaults.putBoolean(KEY_SUPPORT_PAUSE_IMS_VIDEO_CALLS_BOOL, false); sDefaults.putBoolean(KEY_SUPPORT_SWAP_AFTER_MERGE_BOOL, true); sDefaults.putBoolean(KEY_USE_HFA_FOR_PROVISIONING_BOOL, false); + sDefaults.putBoolean(KEY_EDITABLE_VOICEMAIL_NUMBER_SETTING_BOOL, true); sDefaults.putBoolean(KEY_EDITABLE_VOICEMAIL_NUMBER_BOOL, false); sDefaults.putBoolean(KEY_USE_OTASP_FOR_PROVISIONING_BOOL, false); sDefaults.putBoolean(KEY_VOICEMAIL_NOTIFICATION_PERSISTENT_BOOL, false); -- cgit v1.2.3-59-g8ed1b