Merge commit 'c93dfda4' into fix-mergeconflict

* commit 'c93dfda4':
  Do not retry forever in DataConnection.

Change-Id: I58bed4576638a459537d6b5a4c217e1f2fdb3826

diff --cc src/java/com/android/internal/telephony/dataconnection/DataConnection.java
Simple merge

diff --cc src/java/com/android/internal/telephony/dataconnection/DcTrackerBase.java
index 35d6e7dfcea0f8e87c77d2f6de69fb83ea6b7baa,6c21a35fb24c92e63eec20703e5c338101c09ddb..9bdaeaf15519ed2cea03a6dc46d8c32e31c77acb
--- 1/src/java/com/android/internal/telephony/dataconnection/DcTrackerBase.java
--- 2/src/java/com/android/internal/telephony/dataconnection/DcTrackerBase.java
+++ b/src/java/com/android/internal/telephony/dataconnection/DcTrackerBase.java
@@@ -86,14 -86,8 +86,14 @@@ public abstract class DcTrackerBase ext
      /** Delay between APN attempts.
          Note the property override mechanism is there just for testing purpose only. */
      protected static final int APN_DELAY_MILLIS =
-                                 SystemProperties.getInt("persist.radio.apn_delay", 5000);
+                                 SystemProperties.getInt("persist.radio.apn_delay", 20000);
  
-     protected static final int APN_DELAY_MILLIS_RESTART_TRYSETUP_LONG = APN_DELAY_MILLIS * 10;
 +    /** Delay After all APNs have been tried and not all had permanent errors */
 +    protected static final int APN_DELAY_MILLIS_RESTART_TRYSETUP_SHORT = APN_DELAY_MILLIS;
 +
 +    /** Delay After all APNs have been tried and all had permanent errors */
++    protected static final int APN_DELAY_MILLIS_RESTART_TRYSETUP_LONG = APN_DELAY_MILLIS * 3;
 +
      AlarmManager mAlarmManager;
  
      protected Object mDataEnabledLock = new Object();