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

resolve merge conflicts of d5cb58c693 to stage-aosp-master

Browse Source 
Test: I solemnly swear I did not test this conflict resolution.

Merged-In: Ifc35306711dde39eb521dc015da931f4d5f2bf06
Change-Id: I9494087c5a90bccc4326c173bf6395996da357af
This commit is contained in:
Jack Yu
2017-08-17 23:20:41 -07:00
parent 8cbdb54bb8 d5cb58c693
commit f7149eb698
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

@@ -553,19 +553,26 @@ public class CarrierConfigManager {
"carrier_data_call_retry_config_strings"; "carrier_data_call_retry_config_strings";
/** /**
* Delay between trying APN from the pool * Delay in milliseconds between trying APN from the pool
* @hide * @hide
*/ */
public static final String KEY_CARRIER_DATA_CALL_APN_DELAY_DEFAULT_LONG = public static final String KEY_CARRIER_DATA_CALL_APN_DELAY_DEFAULT_LONG =
"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 * @hide
*/ */
public static final String KEY_CARRIER_DATA_CALL_APN_DELAY_FASTER_LONG = public static final String KEY_CARRIER_DATA_CALL_APN_DELAY_FASTER_LONG =
"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 * Data call setup permanent failure causes by the carrier
*/ */
@@ -1592,6 +1599,7 @@ public class CarrierConfigManager {
"others:max_retries=3, 5000, 5000, 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.putLong(KEY_CARRIER_DATA_CALL_APN_RETRY_AFTER_DISCONNECT_LONG, 10000);
sDefaults.putString(KEY_CARRIER_ERI_FILE_NAME_STRING, "eri.xml"); sDefaults.putString(KEY_CARRIER_ERI_FILE_NAME_STRING, "eri.xml");
sDefaults.putInt(KEY_DURATION_BLOCKING_DISABLED_AFTER_EMERGENCY_INT, 7200); sDefaults.putInt(KEY_DURATION_BLOCKING_DISABLED_AFTER_EMERGENCY_INT, 7200);
sDefaults.putStringArray(KEY_CARRIER_METERED_APN_TYPES_STRINGS, sDefaults.putStringArray(KEY_CARRIER_METERED_APN_TYPES_STRINGS,