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

Merge "Add dial_string_replace key to CarrierConfig"

Browse Source 
am: 715903f3c6

Change-Id: Ia54f61dccce81147b42c87691d0f49d5e78dead4
This commit is contained in:
Jordan Liu
2016-09-29 00:09:08 +00:00
committed by android-build-merger
parent 2b30cb4885 715903f3c6
commit 9fba74dd3a
3 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/res/res/values/config.xml
View File

@@ -2220,6 +2220,10 @@
<string-array translatable="false" name="dial_string_replace"> <string-array translatable="false" name="dial_string_replace">
</string-array> </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 <!-- networks that don't want data deactivate when shutdown the phone
note this is dependent on the operator of the network we're on, note this is dependent on the operator of the network we're on,
not operator on the SIM --> not operator on the SIM -->

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

@@ -2240,6 +2240,7 @@
<java-symbol type="attr" name="windowBackgroundFallback" /> <java-symbol type="attr" name="windowBackgroundFallback" />
<java-symbol type="id" name="textSpacerNoButtons" /> <java-symbol type="id" name="textSpacerNoButtons" />
<java-symbol type="array" name="dial_string_replace" /> <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="array" name="networks_not_clear_data" />
<java-symbol type="bool" name="config_switch_phone_on_voice_reg_state_change" /> <java-symbol type="bool" name="config_switch_phone_on_voice_reg_state_change" />
<java-symbol type="string" name="whichHomeApplicationNamed" /> <java-symbol type="string" name="whichHomeApplicationNamed" />

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

@@ -260,6 +260,17 @@ public class CarrierConfigManager {
*/ */
public static final String KEY_CARRIER_WFC_IMS_AVAILABLE_BOOL = "carrier_wfc_ims_available_bool"; 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 * 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 * calling settings will not include an option for "wifi only". If true, the wifi calling
@@ -813,6 +824,7 @@ public class CarrierConfigManager {
sDefaults.putStringArray(KEY_GSM_NONROAMING_NETWORKS_STRING_ARRAY, null); sDefaults.putStringArray(KEY_GSM_NONROAMING_NETWORKS_STRING_ARRAY, null);
sDefaults.putStringArray(KEY_CDMA_ROAMING_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_CDMA_NONROAMING_NETWORKS_STRING_ARRAY, null);
sDefaults.putStringArray(KEY_DIAL_STRING_REPLACE_STRING_ARRAY, null);
sDefaults.putBoolean(KEY_FORCE_HOME_NETWORK_BOOL, false); sDefaults.putBoolean(KEY_FORCE_HOME_NETWORK_BOOL, false);
sDefaults.putInt(KEY_GSM_DTMF_TONE_DELAY_INT, 0); sDefaults.putInt(KEY_GSM_DTMF_TONE_DELAY_INT, 0);
sDefaults.putInt(KEY_IMS_DTMF_TONE_DELAY_INT, 0); sDefaults.putInt(KEY_IMS_DTMF_TONE_DELAY_INT, 0);