diff options
| author | 2017-08-18 07:23:50 +0000 | |
|---|---|---|
| committer | 2017-08-18 07:23:50 +0000 | |
| commit | 0cc9d26dff8644ff6b800528e96580359f515b96 (patch) | |
| tree | 391aa58d22696d90f36c8e8295319f442cfc55d7 | |
| parent | 25b15642304a05702507ab04a9f88b9b9d354088 (diff) | |
| parent | d47339389efb9febb5ea95f93174a3a89861c7ab (diff) | |
resolve merge conflicts of d5cb58c693de to stage-aosp-master am: f7149eb698
am: d47339389e
Change-Id: I348cf0e33ad101a84d33c6938ddc580f9fe06a27
| -rw-r--r-- | telephony/java/android/telephony/CarrierConfigManager.java | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index cfd755aa8536..355f5d2f7613 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -553,20 +553,27 @@ 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 */ public static final String KEY_CARRIER_DATA_CALL_PERMANENT_FAILURE_STRINGS = @@ -1632,6 +1639,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, |