From 4281817f6b624cb51926eb24fa78c68cd9431dce Mon Sep 17 00:00:00 2001 From: Kazuhiro Ondo Date: Sun, 24 Jul 2011 08:08:38 -0700 Subject: Allow suggestedRetryTime to indicate no retry is needed. If suggestedRetryTime is 0x7fffffff then no retry is needed and the framework should not initiate a retry. Bug: 4949208 Change-Id: I3756ef6a3e93beec4ee95863cbc111b9952e5e06 --- telephony/java/com/android/internal/telephony/RILConstants.java | 2 ++ .../android/internal/telephony/gsm/GsmDataConnectionTracker.java | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) 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 @@ public interface RILConstants { // 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 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker { 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"); -- cgit v1.1