Merge "Reset FAILED ApnContext state to IDLE on data setup triggers" into honeycomb-LTE (48b6d5af) · Commits · e / os / android_frameworks_base

telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java

+7 −5

Original line number	Diff line number	Diff line
		@@ -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);