commit aa1c2d8e93160a713a0c7a1bc9a664c0a8db6eb9
author Wink Saville <wink@google.com> Tue Jun 11 14:08:03 2013 -0700
committer The Android Automerger <android-build@android.com> Wed Jun 12 14:29:55 2013 -0700
tree 908079f0f554bb1745ae8cd19fe6786087431682
parent fa503a5f16c6b93518373e5df5049311d6d0e823

Fail on permanent errors in DcTracker.

This reverts the retry added when fixing bug 9240744:

  https://googleplex-android-review.git.corp.google.com/#/c/315817/2

Bug: 9373372
Change-Id: I15d8dcc2c04174d54dd33f8a34813fd72764fc77

src/java/com/android/internal/telephony/dataconnection/DcTracker.java

diff --git a/src/java/com/android/internal/telephony/dataconnection/DcTracker.java b/src/java/com/android/internal/telephony/dataconnection/DcTracker.java
index 3f79f39..507a796 100644
--- a/src/java/com/android/internal/telephony/dataconnection/DcTracker.java
+++ b/src/java/com/android/internal/telephony/dataconnection/DcTracker.java
@@ -1620,9 +1620,8 @@
 
             if (apnContext.getWaitingApnsPermFailCount() == 0) {
                 if (DBG) {
-                    log("onDataSetupComplete: All APN's had permanent failures, long delay");
+                    log("onDataSetupComplete: All APN's had permanent failures, stop retrying");
                 }
-                startAlarmForRestartTrySetup(APN_DELAY_MILLIS * 3, apnContext);
             } else {
                 if (DBG) {
                     log("onDataSetupComplete: Not all APN's had permanent failures, short delay");