am 24286939: Do a disconnect if ApnContext is ready but retrying or failed. (daffa125) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/dataconnection/DcTracker.java

+22 −2

Original line number	Diff line number	Diff line
		@@ -1267,8 +1267,28 @@ public final class DcTracker extends DcTrackerBase {
		apnContext.getDependencyMet() +"))");
		}
		if (apnContext.isReady()) {
		if (enabled && met) return;
		if (!enabled) {
		if (enabled && met) {
		DctConstants.State state = apnContext.getState();
		switch(state) {
		case CONNECTING:
		case SCANNING:
		case CONNECTED:
		case DISCONNECTING:
		// We're "READY" and active so just return
		if (DBG) log("applyNewState: 'ready' so return");
		return;
		case IDLE:
		// fall through: this is unexpected but if it happens cleanup and try setup
		case FAILED:
		case RETRYING: {
		// We're "READY" but not active so disconnect (cleanup = true) and
		// connect (trySetup = true) to be sure we retry the connection.
		trySetup = true;
		apnContext.setReason(Phone.REASON_DATA_ENABLED);
		break;
		}
		}
		} else if (!enabled) {
		apnContext.setReason(Phone.REASON_DATA_DISABLED);
		} else {
		apnContext.setReason(Phone.REASON_DATA_DEPENDENCY_UNMET);