Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 4281817f: Allow suggestedRetryTime to indicate no retry is needed.

Browse Source 
* commit '4281817f6b624cb51926eb24fa78c68cd9431dce':
  Allow suggestedRetryTime to indicate no retry is needed.
This commit is contained in:
Kazuhiro Ondo
2011-07-24 09:11:42 -07:00
committed by Android Git Automerger
parent 3e930dba58 4281817f6b
commit 9820a9d299
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
telephony/java/com/android/internal/telephony/RILConstants.java
View File

@@ -31,6 +31,8 @@ public interface RILConstants {
// From the top of ril.cpp // From the top of ril.cpp
int RIL_ERRNO_INVALID_RESPONSE = -1; int RIL_ERRNO_INVALID_RESPONSE = -1;
int MAX_INT = 0x7FFFFFFF;
// from RIL_Errno // from RIL_Errno
int SUCCESS = 0; int SUCCESS = 0;
int RADIO_NOT_AVAILABLE = 1; /* If radio did not start or is resetting */ int RADIO_NOT_AVAILABLE = 1; /* If radio did not start or is resetting */

6
telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
View File

@@ -1834,7 +1834,11 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
retryOverride = retryOverride =
((DataConnection.CallSetupException)ar.exception).getRetryOverride(); ((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 { } else {
if (DBG) log("onDataSetupComplete: Try next APN"); if (DBG) log("onDataSetupComplete: Try next APN");