am 4281817f: Allow suggestedRetryTime to indicate no retry is needed.
* commit '4281817f6b624cb51926eb24fa78c68cd9431dce':
Allow suggestedRetryTime to indicate no retry is needed.
diff --git a/telephony/java/com/android/internal/telephony/RILConstants.java b/telephony/java/com/android/internal/telephony/RILConstants.java
index 93fc9ce..facee5f 100644
--- a/telephony/java/com/android/internal/telephony/RILConstants.java
+++ b/telephony/java/com/android/internal/telephony/RILConstants.java
@@ -31,6 +31,8 @@
// From the top of ril.cpp
int RIL_ERRNO_INVALID_RESPONSE = -1;
+ int MAX_INT = 0x7FFFFFFF;
+
// from RIL_Errno
int SUCCESS = 0;
int RADIO_NOT_AVAILABLE = 1; /* If radio did not start or is resetting */
diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
index ccdb0bf..a807e99 100644
--- a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
+++ b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
@@ -1834,7 +1834,11 @@
retryOverride =
((DataConnection.CallSetupException)ar.exception).getRetryOverride();
}
- startDelayedRetry(cause, apnContext, retryOverride);
+ if (retryOverride == RILConstants.MAX_INT) {
+ if (DBG) log("No retry is suggested.");
+ } else {
+ startDelayedRetry(cause, apnContext, retryOverride);
+ }
}
} else {
if (DBG) log("onDataSetupComplete: Try next APN");