diff options
| -rw-r--r-- | core/res/res/values/strings.xml | 2 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 1 | ||||
| -rw-r--r-- | telephony/java/android/telephony/CarrierConfigManager.java | 10 |
3 files changed, 13 insertions, 0 deletions
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index edd8b78ac7b2..5e24442835a8 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -101,6 +101,8 @@ <!-- Displayed when the user dialed an MMI code whose function could not be performed because FDN is enabled. This will be displayed in a toast. --> <string name="mmiFdnError">Operation is restricted to fixed dialing numbers only.</string> + <!-- Displayed when a carrier does not support call forwarding queries when roaming. --> + <string name="mmiErrorWhileRoaming">Can not change call forwarding settings from your phone while you are roaming.</string> <!-- Displayed when a phone feature such as call barring was activated. --> <string name="serviceEnabled">Service was enabled.</string> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 86eea9962d9b..d4ba583932c6 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -727,6 +727,7 @@ <java-symbol type="string" name="mmiComplete" /> <java-symbol type="string" name="mmiError" /> <java-symbol type="string" name="mmiFdnError" /> + <java-symbol type="string" name="mmiErrorWhileRoaming" /> <java-symbol type="string" name="month_day_year" /> <java-symbol type="string" name="more_item_label" /> <java-symbol type="string" name="needPuk" /> diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index a240bb1b602c..585d5c158dc5 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -1047,6 +1047,15 @@ public class CarrierConfigManager { public static final String KEY_EDITABLE_TETHER_APN_BOOL = "editable_tether_apn_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. + * @hide + */ + 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; @@ -1229,6 +1238,7 @@ public class CarrierConfigManager { sDefaults.putStringArray(KEY_CARRIER_WIFI_STRING_ARRAY, null); sDefaults.putInt(KEY_PREF_NETWORK_NOTIFICATION_DELAY_INT, -1); sDefaults.putBoolean(KEY_EDITABLE_TETHER_APN_BOOL, false); + sDefaults.putBoolean(KEY_SUPPORT_3GPP_CALL_FORWARDING_WHILE_ROAMING_BOOL, true); } /** |