Merge "Data call retry refactoring" into mm-wireless-dev

diff --cc telephony/java/android/telephony/CarrierConfigManager.java
index 24cc637,a0814b2..1e49dad
--- 1/telephony/java/android/telephony/CarrierConfigManager.java
--- 2/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@@ -586,8 -607,14 +614,15 @@@ public class CarrierConfigManager 
          sDefaults.putString(KEY_CI_ACTION_ON_SYS_UPDATE_EXTRA_VAL_STRING, "");
          sDefaults.putBoolean(KEY_CSP_ENABLED_BOOL, false);
          sDefaults.putBoolean(KEY_ALLOW_ADDING_APNS_BOOL, true);
 +        sDefaults.putBoolean(KEY_BROADCAST_EMERGENCY_CALL_STATE_CHANGES_BOOL, false);
          sDefaults.putBoolean(KEY_ALWAYS_SHOW_EMERGENCY_ALERT_ONOFF_BOOL, false);
+         sDefaults.putString(KEY_CARRIER_DATA_CALL_RETRY_CONFIG_DEFAULT_STRING,
+                 "default_randomization=2000,5000,10000,20000,40000,80000:5000,160000:5000,"
+                         + "320000:5000,640000:5000,1280000:5000,1800000:5000");
+         sDefaults.putString(KEY_CARRIER_DATA_CALL_RETRY_CONFIG_OTHERS_STRING,
+                 "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.putStringArray(KEY_GSM_ROAMING_NETWORKS_STRING_ARRAY, null);
          sDefaults.putStringArray(KEY_GSM_NONROAMING_NETWORKS_STRING_ARRAY, null);