am 48b6d5af: Merge "Reset FAILED ApnContext state to IDLE on data setup triggers" into honeycomb-LTE

* commit '48b6d5afae76bec08c5e1194758e6db3e0f8b07c':
  Reset FAILED ApnContext state to IDLE on data setup triggers
This commit is contained in:
Wink Saville
2011-07-06 19:05:40 -07:00
committed by Android Git Automerger

View File

@@ -608,16 +608,18 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
if (dcac.dataConnection != null) {
dcac.dataConnection.resetRetryCount();
}
Collection<ApnContext> apnList = dcac.getApnListSync();
for (ApnContext apnContext : apnList) {
apnContext.setState(State.IDLE);
}
}
}
// Only check for default APN state
for (ApnContext apnContext : mApnContexts.values()) {
if (apnContext.getState() == State.FAILED) {
// By this time, alarms for all failed Apns
// should be stopped if any.
// Make sure to set the state back to IDLE
// so that setup data can happen.
apnContext.setState(State.IDLE);
}
if (apnContext.isReady()) {
if (apnContext.getState() == State.IDLE) {
apnContext.setReason(reason);