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

Merge "Reduced the retry after disconnect delay" into oc-mr1-dev

Browse Source 
am: b70a55a7b5

Change-Id: Ib4906735405a633b8b3905761b51a28d39cf830d
This commit is contained in:
Jack Yu
2017-08-17 18:16:53 +00:00
committed by android-build-merger
parent 2a09f526d3 b70a55a7b5
commit f6b28f0b06
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -567,19 +567,26 @@ public class CarrierConfigManager {
"carrier_data_call_retry_config_strings";
/**
* Delay between trying APN from the pool
* Delay in milliseconds between trying APN from the pool
* @hide
*/
public static final String KEY_CARRIER_DATA_CALL_APN_DELAY_DEFAULT_LONG =
"carrier_data_call_apn_delay_default_long";
/**
* Faster delay between trying APN from the pool
* Faster delay in milliseconds between trying APN from the pool
* @hide
*/
public static final String KEY_CARRIER_DATA_CALL_APN_DELAY_FASTER_LONG =
"carrier_data_call_apn_delay_faster_long";
/**
* Delay in milliseconds for retrying APN after disconnect
* @hide
*/
public static final String KEY_CARRIER_DATA_CALL_APN_RETRY_AFTER_DISCONNECT_LONG =
"carrier_data_call_apn_retry_after_disconnect_long";
/**
* Data call setup permanent failure causes by the carrier
*/
@@ -1645,6 +1652,7 @@ public class CarrierConfigManager {
"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_FASTER_LONG, 3000);
sDefaults.putLong(KEY_CARRIER_DATA_CALL_APN_RETRY_AFTER_DISCONNECT_LONG, 10000);
sDefaults.putString(KEY_CARRIER_ERI_FILE_NAME_STRING, "eri.xml");
sDefaults.putInt(KEY_DURATION_BLOCKING_DISABLED_AFTER_EMERGENCY_INT, 7200);
sDefaults.putStringArray(KEY_CARRIER_METERED_APN_TYPES_STRINGS,