Merge "Fixed that APN context stuck in SCANNING state" into oc-dev (76951491) · Commits · e / os / android_frameworks_opt_telephony

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

+16 −10

Original line number	Diff line number	Diff line
		@@ -1664,7 +1664,7 @@ public class DcTracker extends Handler {
		str.append("trySetupData failed. apnContext = [type=" + apnContext.getApnType() +
		", mState=" + apnContext.getState() + ", mDataEnabled=" +
		apnContext.isEnabled() + ", mDependencyMet=" +
		apnContext.getDependencyMet() + "] ");
		apnContext.getDependencyMet() + "].");

		if (!apnContext.isConnectable()) {
		str.append(" isConnectable = false.");
		@@ -1673,8 +1673,8 @@ public class DcTracker extends Handler {
		str.append(" data not allowed: " + failureReason.getDataAllowFailReason() + ".");
		}
		if (!isDataAllowedForApn(apnContext)) {
		str.append("isDataAllowedForApn = false. RAT = " +
		mPhone.getServiceState().getRilDataRadioTechnology());
		str.append(" isDataAllowedForApn = false. RAT = "
		+ mPhone.getServiceState().getRilDataRadioTechnology() + ".");
		}
		if (!mDataEnabledSettings.isDataEnabled()) {
		str.append(" isDataEnabled() = false. "
		@@ -1682,15 +1682,21 @@ public class DcTracker extends Handler {
		+ ", userDataEnabled = " + mDataEnabledSettings.isUserDataEnabled()
		+ ", isPolicyDataEnabled = " + mDataEnabledSettings.isPolicyDataEnabled()
		+ ", isCarrierDataEnabled = "
		+ mDataEnabledSettings.isCarrierDataEnabled());
		+ mDataEnabledSettings.isCarrierDataEnabled() + ".");
		}
		if (isEmergency()) {
		str.append("emergency = true");
		str.append(" emergency = true.");
		}

		// If this is a data retry, we should set the APN state to FAILED so it won't stay
		// in SCANNING forever.
		if (apnContext.getState() == DctConstants.State.SCANNING) {
		apnContext.setState(DctConstants.State.FAILED);
		str.append(" Stop retrying.");
		}

		if (DBG) log(str.toString());
		apnContext.requestLog(str.toString());

		return false;
		}
		}
		@@ -2553,7 +2559,6 @@ public class DcTracker extends Handler {
		DctConstants.State state = apnContext.getState();
		switch(state) {
		case CONNECTING:
		case SCANNING:
		case CONNECTED:
		case DISCONNECTING:
		// We're "READY" and active so just return
		@@ -2563,6 +2568,7 @@ public class DcTracker extends Handler {
		case IDLE:
		// fall through: this is unexpected but if it happens cleanup and try setup
		case FAILED:
		case SCANNING:
		case RETRYING: {
		// We're "READY" but not active so disconnect (cleanup = true) and
		// connect (trySetup = true) to be sure we retry the connection.