commit | deb62be2e87b19e9bbbc668f8d9327b12dba4a3b | [log] [tgz] |
---|---|---|
author | Wink Saville <wink@google.com> | Sun Jul 24 09:11:28 2011 -0700 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Sun Jul 24 09:11:28 2011 -0700 |
tree | f26293bc37358c2b45ba75c70be4ca24c6e65bd8 | |
parent | 4281817f6b624cb51926eb24fa78c68cd9431dce [diff] | |
parent | 789df167fa31e684baa957aea1a4430963bf12b1 [diff] |
Merge "Configure RAT dependent retry pattern in GSM DCT." into honeycomb-LTE
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 b187aee..be129d5 100644 --- a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java +++ b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
@@ -1845,7 +1845,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");