Change to consider SIGNAL_LOST as permanenet failure only if not attached. (796d3c22) · Commits · e / os / android_frameworks_opt_telephony

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -1590,14 +1590,14 @@ public final class DataConnection extends StateMachine {
		+ " result.isRestartRadioFail=" +
		result.mFailCause.isRestartRadioFail()
		+ " result.isPermanentFail=" +
		result.mFailCause.isPermanentFail());
		mDct.isPermanentFail(result.mFailCause));
		}
		if (result.mFailCause.isRestartRadioFail()) {
		if (DBG) log("DcActivatingState: ERR_RilError restart radio");
		mDct.sendRestartRadio();
		mInactiveState.setEnterNotificationParams(cp, result.mFailCause);
		transitionTo(mInactiveState);
		} else if (result.mFailCause.isPermanentFail()) {
		} else if (mDct.isPermanentFail(result.mFailCause)) {
		if (DBG) log("DcActivatingState: ERR_RilError perm error");
		mInactiveState.setEnterNotificationParams(cp, result.mFailCause);
		transitionTo(mInactiveState);
		@@ -1662,7 +1662,7 @@ public final class DataConnection extends StateMachine {
		mDct.sendRestartRadio();
		mInactiveState.setEnterNotificationParams(cp, cause);
		transitionTo(mInactiveState);
		} else if (cause.isPermanentFail()) {
		} else if (mDct.isPermanentFail(cause)) {
		if (DBG) log("DcActivatingState: EVENT_GET_LAST_FAIL_DONE perm er");
		mInactiveState.setEnterNotificationParams(cp, cause);
		transitionTo(mInactiveState);

+1 −1

Original line number	Diff line number	Diff line
		@@ -245,7 +245,7 @@ class DcController extends StateMachine {
		if (failCause.isRestartRadioFail()) {
		if (DBG) log("onDataStateChanged: X restart radio");
		mDct.sendRestartRadio();
		} else if (failCause.isPermanentFail()) {
		} else if (mDct.isPermanentFail(failCause)) {
		if (DBG) log("onDataStateChanged: inactive, add to cleanup list");
		apnsToCleanup.addAll(dc.mApnContexts);
		} else {

+8 −2

Original line number	Diff line number	Diff line
		@@ -1194,6 +1194,12 @@ public final class DcTracker extends DcTrackerBase {
		return false;
		}

		@Override
		protected boolean isPermanentFail(DcFailCause dcFailCause) {
		return (dcFailCause.isPermanentFail() &&
		(mAttached.get() == false \|\| dcFailCause != DcFailCause.SIGNAL_LOST));
		}

		private ApnSetting makeApnSetting(Cursor cursor) {
		String[] types = parseTypes(
		cursor.getString(cursor.getColumnIndexOrThrow(Telephony.Carriers.TYPE)));
		@@ -1538,7 +1544,7 @@ public final class DcTracker extends DcTrackerBase {
		private void notifyNoData(DcFailCause lastFailCauseCode,
		ApnContext apnContext) {
		if (DBG) log( "notifyNoData: type=" + apnContext.getApnType());
		if (lastFailCauseCode.isPermanentFail()
		if (isPermanentFail(lastFailCauseCode)
		&& (!apnContext.getApnType().equals(PhoneConstants.APN_TYPE_DEFAULT))) {
		mPhone.notifyDataConnectionFailed(apnContext.getReason(), apnContext.getApnType());
		}
		@@ -2008,7 +2014,7 @@ public final class DcTracker extends DcTrackerBase {
		apnContext.getApnType(), apn != null ? apn.apn : "unknown", cause.toString());

		// Count permanent failures and remove the APN we just tried
		if (cause.isPermanentFail()) apnContext.decWaitingApnsPermFailCount();
		if (isPermanentFail(cause)) apnContext.decWaitingApnsPermFailCount();

		apnContext.removeWaitingApn(apnContext.getApnSetting());
		if (DBG) {

+1 −0

Original line number	Diff line number	Diff line
		@@ -767,6 +767,7 @@ public abstract class DcTrackerBase extends Handler {
		public abstract String[] getPcscfAddress(String apnType);
		public abstract void setImsRegistrationState(boolean registered);
		protected abstract boolean mvnoMatches(IccRecords r, String mvno_type, String mvno_match_data);
		protected abstract boolean isPermanentFail(DcFailCause dcFailCause);

		@Override
		public void handleMessage(Message msg) {