Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add UI prompt for MMI code failure on 3gpp" into nyc-mr2-dev

Browse Source
This commit is contained in:
Brad Ebinger
2016-12-19 19:53:00 +00:00
committed by Android (Google) Code Review
parent 5109de9bd3 ac8d8e7358
commit 73dcab62b7
3 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/res/res/values/strings.xml
View File

@@ -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>

1
core/res/res/values/symbols.xml
View File

@@ -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" />

10
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -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);
}
/**