diff options
| -rw-r--r-- | core/res/res/values/config.xml | 4 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 1 | ||||
| -rw-r--r-- | telephony/java/android/telephony/CarrierConfigManager.java | 12 |
3 files changed, 17 insertions, 0 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 44cbc0f91527..05d9a28333b7 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -2220,6 +2220,10 @@ <string-array translatable="false" name="dial_string_replace"> </string-array> + <!-- Flag indicating whether radio is to be restarted on the error of + PDP_FAIL_REGULAR_DEACTIVATION/0x24 --> + <bool name="config_restart_radio_on_pdp_fail_regular_deactivation">false</bool> + <!-- networks that don't want data deactivate when shutdown the phone note this is dependent on the operator of the network we're on, not operator on the SIM --> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 206a910e4b7c..5018e2fb63c0 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -2240,6 +2240,7 @@ <java-symbol type="attr" name="windowBackgroundFallback" /> <java-symbol type="id" name="textSpacerNoButtons" /> <java-symbol type="array" name="dial_string_replace" /> + <java-symbol type="bool" name="config_restart_radio_on_pdp_fail_regular_deactivation" /> <java-symbol type="array" name="networks_not_clear_data" /> <java-symbol type="bool" name="config_switch_phone_on_voice_reg_state_change" /> <java-symbol type="string" name="whichHomeApplicationNamed" /> diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 6eb792b7aba8..77b562d34b05 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -261,6 +261,17 @@ public class CarrierConfigManager { public static final String KEY_CARRIER_WFC_IMS_AVAILABLE_BOOL = "carrier_wfc_ims_available_bool"; /** + * Specifies a map from dialstrings to replacements for roaming network service numbers which + * cannot be replaced on the carrier side. + * <p> + * Individual entries have the format: + * [dialstring to replace]:[replacement] + * @hide + */ + public static final String KEY_DIAL_STRING_REPLACE_STRING_ARRAY = + "dial_string_replace_string_array"; + + /** * Flag specifying whether WFC over IMS supports the "wifi only" option. If false, the wifi * calling settings will not include an option for "wifi only". If true, the wifi calling * settings will include an option for "wifi only" @@ -813,6 +824,7 @@ public class CarrierConfigManager { sDefaults.putStringArray(KEY_GSM_NONROAMING_NETWORKS_STRING_ARRAY, null); sDefaults.putStringArray(KEY_CDMA_ROAMING_NETWORKS_STRING_ARRAY, null); sDefaults.putStringArray(KEY_CDMA_NONROAMING_NETWORKS_STRING_ARRAY, null); + sDefaults.putStringArray(KEY_DIAL_STRING_REPLACE_STRING_ARRAY, null); sDefaults.putBoolean(KEY_FORCE_HOME_NETWORK_BOOL, false); sDefaults.putInt(KEY_GSM_DTMF_TONE_DELAY_INT, 0); sDefaults.putInt(KEY_IMS_DTMF_TONE_DELAY_INT, 0); |