From ade9937437d6439ddd4c638975f2777f5ff541a9 Mon Sep 17 00:00:00 2001 From: Brad Ebinger Date: Fri, 9 Dec 2016 13:18:30 -0800 Subject: [PATCH] Add UI prompt for MMI code failure on 3gpp Some carriers do not support call forwarding MMI codes while roaming on 3gpp networks. A new message has been added that clarifies this to the user. Test: Manual Bug: 30106345 Merged-In: Id8d3434b02346eaad4f52d514a3269b5750ca1c3 Change-Id: Id8d3434b02346eaad4f52d514a3269b5750ca1c3 --- api/current.txt | 1 + api/system-current.txt | 1 + api/test-current.txt | 1 + core/res/res/values/strings.xml | 2 ++ core/res/res/values/symbols.xml | 1 + .../java/android/telephony/CarrierConfigManager.java | 9 +++++++++ 6 files changed, 15 insertions(+) diff --git a/api/current.txt b/api/current.txt index 72351443ea1e4..3efbb2df38b73 100644 --- a/api/current.txt +++ b/api/current.txt @@ -37410,6 +37410,7 @@ package android.telephony { field public static final java.lang.String KEY_SHOW_ONSCREEN_DIAL_BUTTON_BOOL = "show_onscreen_dial_button_bool"; field public static final java.lang.String KEY_SIMPLIFIED_NETWORK_SETTINGS_BOOL = "simplified_network_settings_bool"; field public static final java.lang.String KEY_SIM_NETWORK_UNLOCK_ALLOW_DISMISS_BOOL = "sim_network_unlock_allow_dismiss_bool"; + field public static final java.lang.String KEY_SUPPORT_3GPP_CALL_FORWARDING_WHILE_ROAMING_BOOL = "support_3gpp_call_forwarding_while_roaming_bool"; field public static final java.lang.String KEY_SUPPORT_CONFERENCE_CALL_BOOL = "support_conference_call_bool"; field public static final java.lang.String KEY_SUPPORT_PAUSE_IMS_VIDEO_CALLS_BOOL = "support_pause_ims_video_calls_bool"; field public static final java.lang.String KEY_SUPPORT_SWAP_AFTER_MERGE_BOOL = "support_swap_after_merge_bool"; diff --git a/api/system-current.txt b/api/system-current.txt index e1a45685b0868..2407c7adb6136 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -40580,6 +40580,7 @@ package android.telephony { field public static final java.lang.String KEY_SHOW_ONSCREEN_DIAL_BUTTON_BOOL = "show_onscreen_dial_button_bool"; field public static final java.lang.String KEY_SIMPLIFIED_NETWORK_SETTINGS_BOOL = "simplified_network_settings_bool"; field public static final java.lang.String KEY_SIM_NETWORK_UNLOCK_ALLOW_DISMISS_BOOL = "sim_network_unlock_allow_dismiss_bool"; + field public static final java.lang.String KEY_SUPPORT_3GPP_CALL_FORWARDING_WHILE_ROAMING_BOOL = "support_3gpp_call_forwarding_while_roaming_bool"; field public static final java.lang.String KEY_SUPPORT_CONFERENCE_CALL_BOOL = "support_conference_call_bool"; field public static final java.lang.String KEY_SUPPORT_PAUSE_IMS_VIDEO_CALLS_BOOL = "support_pause_ims_video_calls_bool"; field public static final java.lang.String KEY_SUPPORT_SWAP_AFTER_MERGE_BOOL = "support_swap_after_merge_bool"; diff --git a/api/test-current.txt b/api/test-current.txt index a9af7f3b2ab0c..cdbf5ba550e41 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -37492,6 +37492,7 @@ package android.telephony { field public static final java.lang.String KEY_SHOW_ONSCREEN_DIAL_BUTTON_BOOL = "show_onscreen_dial_button_bool"; field public static final java.lang.String KEY_SIMPLIFIED_NETWORK_SETTINGS_BOOL = "simplified_network_settings_bool"; field public static final java.lang.String KEY_SIM_NETWORK_UNLOCK_ALLOW_DISMISS_BOOL = "sim_network_unlock_allow_dismiss_bool"; + field public static final java.lang.String KEY_SUPPORT_3GPP_CALL_FORWARDING_WHILE_ROAMING_BOOL = "support_3gpp_call_forwarding_while_roaming_bool"; field public static final java.lang.String KEY_SUPPORT_CONFERENCE_CALL_BOOL = "support_conference_call_bool"; field public static final java.lang.String KEY_SUPPORT_PAUSE_IMS_VIDEO_CALLS_BOOL = "support_pause_ims_video_calls_bool"; field public static final java.lang.String KEY_SUPPORT_SWAP_AFTER_MERGE_BOOL = "support_swap_after_merge_bool"; diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 426d2ebecab0a..42316980aa2d4 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -101,6 +101,8 @@ Operation is restricted to fixed dialing numbers only. + + Can not change call forwarding settings from your phone while you are roaming. Service was enabled. diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index bdac134f20cb7..66087d6970483 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -725,6 +725,7 @@ + diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 04c10d28cb36e..98029165e64f8 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -1119,6 +1119,14 @@ public class CarrierConfigManager { public static final String KEY_EDITABLE_WFC_ROAMING_MODE_BOOL = "editable_wfc_roaming_mode_bool"; + /** + * Indicates whether the carrier supports 3gpp call forwarding MMI codes while roaming. If + * false, the user will be notified that call forwarding is not available when the MMI code + * fails. + */ + public static final String KEY_SUPPORT_3GPP_CALL_FORWARDING_WHILE_ROAMING_BOOL = + "support_3gpp_call_forwarding_while_roaming_bool"; + /** The default value for every variable. */ private final static PersistableBundle sDefaults; @@ -1323,6 +1331,7 @@ public class CarrierConfigManager { sDefaults.putBoolean(KEY_NOTIFY_VT_HANDOVER_TO_WIFI_FAILURE_BOOL, false); sDefaults.putStringArray(KEY_FILTERED_CNAP_NAMES_STRING_ARRAY, null); sDefaults.putBoolean(KEY_EDITABLE_WFC_ROAMING_MODE_BOOL, false); + sDefaults.putBoolean(KEY_SUPPORT_3GPP_CALL_FORWARDING_WHILE_ROAMING_BOOL, true); } /**