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

Merge "Add key to CarrierConfig"

Browse Source 
am: 154c22d2d4

Change-Id: I5355f13efb084c0785bcce60ef327dc4bc436fe2
This commit is contained in:
Jordan Liu
2016-09-27 22:24:23 +00:00
committed by android-build-merger
parent 62be010f2a 154c22d2d4
commit fda7370ddd
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/res/res/values-mcc310-mnc410/config.xml
View File

@@ -67,7 +67,4 @@
<item>"#8"</item> <item>"#8"</item>
<item>"#9"</item> <item>"#9"</item>
</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">true</bool>
</resources> </resources>

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

@@ -2220,10 +2220,6 @@
<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,7 +2240,6 @@
<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" />

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

@@ -85,6 +85,15 @@ public class CarrierConfigManager {
public static final String public static final String
KEY_REQUIRE_ENTITLEMENT_CHECKS_BOOL = "require_entitlement_checks_bool"; KEY_REQUIRE_ENTITLEMENT_CHECKS_BOOL = "require_entitlement_checks_bool";
/**
* Flag indicating whether radio is to be restarted on error PDP_FAIL_REGULAR_DEACTIVATION
* This is false by default.
* @hide
*/
public static final String
KEY_RESTART_RADIO_ON_PDP_FAIL_REGULAR_DEACTIVATION_BOOL =
"restart_radio_on_pdp_fail_regular_deactivation_bool";
/** /**
* If true, enable vibration (haptic feedback) for key presses in the EmergencyDialer activity. * If true, enable vibration (haptic feedback) for key presses in the EmergencyDialer activity.
* The pattern is set on a per-platform basis using config_virtualKeyVibePattern. To be * The pattern is set on a per-platform basis using config_virtualKeyVibePattern. To be
@@ -768,6 +777,7 @@ public class CarrierConfigManager {
sDefaults.putBoolean(KEY_VOICE_PRIVACY_DISABLE_UI_BOOL, false); sDefaults.putBoolean(KEY_VOICE_PRIVACY_DISABLE_UI_BOOL, false);
sDefaults.putBoolean(KEY_WORLD_PHONE_BOOL, false); sDefaults.putBoolean(KEY_WORLD_PHONE_BOOL, false);
sDefaults.putBoolean(KEY_REQUIRE_ENTITLEMENT_CHECKS_BOOL, true); sDefaults.putBoolean(KEY_REQUIRE_ENTITLEMENT_CHECKS_BOOL, true);
sDefaults.putBoolean(KEY_RESTART_RADIO_ON_PDP_FAIL_REGULAR_DEACTIVATION_BOOL, false);
sDefaults.putInt(KEY_VOLTE_REPLACEMENT_RAT_INT, 0); sDefaults.putInt(KEY_VOLTE_REPLACEMENT_RAT_INT, 0);
sDefaults.putString(KEY_DEFAULT_SIM_CALL_MANAGER_STRING, ""); sDefaults.putString(KEY_DEFAULT_SIM_CALL_MANAGER_STRING, "");
sDefaults.putString(KEY_VVM_DESTINATION_NUMBER_STRING, ""); sDefaults.putString(KEY_VVM_DESTINATION_NUMBER_STRING, "");