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

Extend apn retry configurability to more apn types

Browse Source 
am: c1f0e87051

Change-Id: Id44b57c992efb8d649a2fa409b798714364c5dcc
This commit is contained in:
Jack Yu
2016-09-13 20:22:23 +00:00
committed by android-build-merger
parent cbb440fbb1 c1f0e87051
commit 5e45c9c673
1 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -433,18 +433,11 @@ public class CarrierConfigManager {
"disable_severe_when_extreme_disabled_bool"; "disable_severe_when_extreme_disabled_bool";
/** /**
* The data call APN retry configuration for default type APN. * The data call retry configuration for different types of APN.
* @hide * @hide
*/ */
public static final String KEY_CARRIER_DATA_CALL_RETRY_CONFIG_DEFAULT_STRING = public static final String KEY_CARRIER_DATA_CALL_RETRY_CONFIG_STRINGS =
"carrier_data_call_retry_config_default_string"; "carrier_data_call_retry_config_strings";
/**
* The data call APN retry configuration for other type APNs.
* @hide
*/
public static final String KEY_CARRIER_DATA_CALL_RETRY_CONFIG_OTHERS_STRING =
"carrier_data_call_retry_config_others_string";
/** /**
* Delay between trying APN from the pool * Delay between trying APN from the pool
@@ -1022,11 +1015,12 @@ public class CarrierConfigManager {
sDefaults.putBoolean(KEY_BROADCAST_EMERGENCY_CALL_STATE_CHANGES_BOOL, false); sDefaults.putBoolean(KEY_BROADCAST_EMERGENCY_CALL_STATE_CHANGES_BOOL, false);
sDefaults.putBoolean(KEY_ALWAYS_SHOW_EMERGENCY_ALERT_ONOFF_BOOL, false); sDefaults.putBoolean(KEY_ALWAYS_SHOW_EMERGENCY_ALERT_ONOFF_BOOL, false);
sDefaults.putBoolean(KEY_DISABLE_SEVERE_WHEN_EXTREME_DISABLED_BOOL, true); sDefaults.putBoolean(KEY_DISABLE_SEVERE_WHEN_EXTREME_DISABLED_BOOL, true);
sDefaults.putString(KEY_CARRIER_DATA_CALL_RETRY_CONFIG_DEFAULT_STRING, sDefaults.putStringArray(KEY_CARRIER_DATA_CALL_RETRY_CONFIG_STRINGS, new String[]{
"default_randomization=2000,5000,10000,20000,40000,80000:5000,160000:5000," "default:default_randomization=2000,5000,10000,20000,40000,80000:5000,160000:5000,"
+ "320000:5000,640000:5000,1280000:5000,1800000:5000"); + "320000:5000,640000:5000,1280000:5000,1800000:5000",
sDefaults.putString(KEY_CARRIER_DATA_CALL_RETRY_CONFIG_OTHERS_STRING, "mms:default_randomization=2000,5000,10000,20000,40000,80000:5000,160000:5000,"
"max_retries=3, 5000, 5000, 5000"); + "320000:5000,640000:5000,1280000:5000,1800000:5000",
"others:max_retries=3, 5000, 5000, 5000"});
sDefaults.putLong(KEY_CARRIER_DATA_CALL_APN_DELAY_DEFAULT_LONG, 20000); sDefaults.putLong(KEY_CARRIER_DATA_CALL_APN_DELAY_DEFAULT_LONG, 20000);
sDefaults.putLong(KEY_CARRIER_DATA_CALL_APN_DELAY_FASTER_LONG, 3000); sDefaults.putLong(KEY_CARRIER_DATA_CALL_APN_DELAY_FASTER_LONG, 3000);
sDefaults.putString(KEY_CARRIER_ERI_FILE_NAME_STRING, "eri.xml"); sDefaults.putString(KEY_CARRIER_ERI_FILE_NAME_STRING, "eri.xml");