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

am f3166799: Merge "Fix GSM permanent failure handling, DO NOT MERGE." into gingerbread

Browse Source 
* commit 'f316679971be356dbb01f991e95742bc5f2a8383':
  Fix GSM permanent failure handling, DO NOT MERGE.
This commit is contained in:
Wink Saville
2010-11-30 11:46:34 -08:00
committed by Android Git Automerger
parent d2607118ed f316679971
commit 2ebb3a2d9b
1 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -115,7 +115,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
* It is a subset of allApns and has the same format * It is a subset of allApns and has the same format
*/ */
private ArrayList<ApnSetting> waitingApns = null; private ArrayList<ApnSetting> waitingApns = null;
private int waitingApnsPermanentFailureCountDown = 0;
private ApnSetting preferredApn = null; private ApnSetting preferredApn = null;
/* Currently active APN */ /* Currently active APN */
@@ -449,6 +449,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
if (state == State.IDLE) { if (state == State.IDLE) {
waitingApns = buildWaitingApns(); waitingApns = buildWaitingApns();
waitingApnsPermanentFailureCountDown = waitingApns.size();
if (waitingApns.isEmpty()) { if (waitingApns.isEmpty()) {
if (DBG) log("No APN found"); if (DBG) log("No APN found");
notifyNoData(GsmDataConnection.FailCause.MISSING_UNKNOWN_APN); notifyNoData(GsmDataConnection.FailCause.MISSING_UNKNOWN_APN);
@@ -1154,20 +1155,25 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
TelephonyManager.getDefault().getNetworkType()); TelephonyManager.getDefault().getNetworkType());
} }
// No try for permanent failure // Count permanent failures and remove the APN we just tried
if (cause.isPermanentFail()) { waitingApnsPermanentFailureCountDown -= cause.isPermanentFail() ? 1 : 0;
notifyNoData(cause);
phone.notifyDataConnection(Phone.REASON_APN_FAILED);
onEnableApn(apnTypeToId(mRequestedApnType), DISABLED);
return;
}
waitingApns.remove(0); waitingApns.remove(0);
if (DBG) log(String.format("onDataSetupComplete: waitingApns.size=%d" +
" waitingApnsPermanenatFailureCountDown=%d",
waitingApns.size(), waitingApnsPermanentFailureCountDown));
// See if there are more APN's to try
if (waitingApns.isEmpty()) { if (waitingApns.isEmpty()) {
// No more to try, start delayed retry if (waitingApnsPermanentFailureCountDown == 0) {
startDelayedRetry(cause, reason); if (DBG) log("onDataSetupComplete: Permanent failures stop retrying");
notifyNoData(cause);
phone.notifyDataConnection(Phone.REASON_APN_FAILED);
} else {
if (DBG) log("onDataSetupComplete: Not all permanent failures, retry");
startDelayedRetry(cause, reason);
}
} else { } else {
// we still have more apns to try if (DBG) log("onDataSetupComplete: Try next APN");
setState(State.SCANNING); setState(State.SCANNING);
// Wait a bit before trying the next APN, so that // Wait a bit before trying the next APN, so that
// we're not tying up the RIL command channel // we're not tying up the RIL command channel