diff options
| -rw-r--r-- | telephony/java/android/telephony/CarrierConfigManager.java | 40 |
1 files changed, 35 insertions, 5 deletions
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index cd73bda496a1..18acfa438ec3 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -5542,7 +5542,7 @@ public class CarrierConfigManager { "telephony_network_capability_priorities_string_array"; /** - * Defines the rules for data retry. + * Defines the rules for data setup retry. * * The syntax of the retry rule: * 1. Retry based on {@link NetworkCapabilities}. Note that only APN-type network capabilities @@ -5574,8 +5574,34 @@ public class CarrierConfigManager { * // TODO: remove KEY_CARRIER_DATA_CALL_RETRY_CONFIG_STRINGS * @hide */ - public static final String KEY_TELEPHONY_DATA_RETRY_RULES_STRING_ARRAY = - "telephony_data_retry_rules_string_array"; + public static final String KEY_TELEPHONY_DATA_SETUP_RETRY_RULES_STRING_ARRAY = + "telephony_data_setup_retry_rules_string_array"; + + /** + * Defines the rules for data handover retry. + * + * The syntax of the retry rule: + * 1. Retry when handover fails. + * "retry_interval=[n1|n2|n3|...], [maximum_retries=n]" + * + * For example, + * "retry_interval=1000|3000|5000, maximum_retries=10" means handover retry will happen in 1s, + * 3s, 5s, 5s, 5s....up to 10 times. + * + * 2. Retry when handover fails with certain fail causes. + * "retry_interval=[n1|n2|n3|...], fail_causes=[cause1|cause2|cause3|...], [maximum_retries=n] + * + * For example, + * "retry_interval=1000, maximum_retries=3, fail_causes=5" means handover retry every 1 second + * for up to 3 times when handover fails with the cause 5. + * + * "maximum_retries=0, fail_causes=6|10|67" means handover retry should not happen for those + * causes. + * + * @hide + */ + public static final String KEY_TELEPHONY_DATA_HANDOVER_RETRY_RULES_STRING_ARRAY = + "telephony_data_handover_retry_rules_string_array"; /** * The patterns of missed incoming call sms. This is the regular expression used for @@ -5936,7 +5962,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.putLong(KEY_CARRIER_DATA_CALL_APN_RETRY_AFTER_DISCONNECT_LONG, 3000); sDefaults.putInt(KEY_CARRIER_DATA_CALL_RETRY_NETWORK_REQUESTED_MAX_COUNT_INT, 3); sDefaults.putString(KEY_CARRIER_ERI_FILE_NAME_STRING, "eri.xml"); sDefaults.putInt(KEY_DURATION_BLOCKING_DISABLED_AFTER_EMERGENCY_INT, 7200); @@ -6404,7 +6430,7 @@ public class CarrierConfigManager { "ims:40", "dun:30", "enterprise:20", "internet:20" }); sDefaults.putStringArray( - KEY_TELEPHONY_DATA_RETRY_RULES_STRING_ARRAY, new String[] { + KEY_TELEPHONY_DATA_SETUP_RETRY_RULES_STRING_ARRAY, new String[] { "capabilities=eims, retry_interval=1000, maximum_retries=20", "fail_causes=8|27|28|29|30|32|33|35|50|51|111|-5|-6|65537|65538|-3|2253|" + "2254, maximum_retries=0", // No retry for those causes @@ -6413,6 +6439,10 @@ public class CarrierConfigManager { + "5000|10000|15000|20000|40000|60000|120000|240000|" + "600000|1200000|1800000, maximum_retries=20" }); + sDefaults.putStringArray( + KEY_TELEPHONY_DATA_HANDOVER_RETRY_RULES_STRING_ARRAY, new String[] { + "retry_interval=1000|2000|4000|8000|16000, maximum_retries=5" + }); sDefaults.putStringArray(KEY_MISSED_INCOMING_CALL_SMS_PATTERN_STRING_ARRAY, new String[0]); sDefaults.putBoolean(KEY_DISABLE_DUN_APN_WHILE_ROAMING_WITH_PRESET_APN_BOOL, false); sDefaults.putString(KEY_DEFAULT_PREFERRED_APN_NAME_STRING, ""); |