Snap for 5044688 from 6db723fdc3f7482efb5a914f12c2f858ae4897d7 to pi-qpr2-release (e1b59d89) · Commits · e / os / android_frameworks_opt_telephony

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -1639,8 +1639,8 @@ public class DataConnection extends StateMachine {
		String str = "DcActivatingState: ERROR_DATA_SERVICE_SPECIFIC_ERROR "
		+ " delay=" + delay
		+ " result=" + result
		+ " result.isRestartRadioFail=" +
		result.mFailCause.isRestartRadioFail(mPhone.getContext(),
		+ " result.isRadioRestartFailure="
		+ result.mFailCause.isRadioRestartFailure(mPhone.getContext(),
		mPhone.getSubId())
		+ " isPermanentFailure=" +
		mDct.isPermanentFailure(result.mFailCause);

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -329,7 +329,7 @@ public class DcController extends StateMachine {
		mDct.isCleanupRequired.set(false);
		} else {
		DcFailCause failCause = DcFailCause.fromInt(newState.getStatus());
		if (failCause.isRestartRadioFail(mPhone.getContext(),
		if (failCause.isRadioRestartFailure(mPhone.getContext(),
		mPhone.getSubId())) {
		if (DBG) {
		log("onDataStateChanged: X restart radio, failCause="

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

+18 −14

Original line number	Diff line number	Diff line
		@@ -16,10 +16,10 @@
		package com.android.internal.telephony.dataconnection;

		import android.content.Context;
		import android.content.res.Resources;
		import android.os.PersistableBundle;
		import android.telephony.CarrierConfigManager;

		import java.util.Arrays;
		import java.util.HashMap;
		import java.util.HashSet;

		@@ -146,25 +146,29 @@ public enum DcFailCause {
		}

		/**
		* Returns whether or not the radio has failed and also needs to be restarted.
		* By default, we do not restart radio on REGULAR_DEACTIVATION.
		* Returns whether or not the fail cause is a failure that requires a modem restart
		*
		* @param context device context
		* @param subId subscription id
		* @return true if the radio has failed and the carrier requres restart, otherwise false
		* @param subId subscription index
		* @return true if the fail cause code needs platform to trigger a modem restart.
		*/
		public boolean isRestartRadioFail(Context context, int subId) {
		if (this == REGULAR_DEACTIVATION) {
		public boolean isRadioRestartFailure(Context context, int subId) {
		CarrierConfigManager configManager = (CarrierConfigManager)
		context.getSystemService(Context.CARRIER_CONFIG_SERVICE);
		if (configManager != null) {
		PersistableBundle b = configManager.getConfigForSubId(subId);
		if (b != null) {
		return b.getBoolean(CarrierConfigManager.
		KEY_RESTART_RADIO_ON_PDP_FAIL_REGULAR_DEACTIVATION_BOOL);
		int[] causeCodes = b.getIntArray(CarrierConfigManager
		.KEY_RADIO_RESTART_FAILURE_CAUSES_INT_ARRAY);
		if (causeCodes != null) {
		return Arrays.stream(causeCodes).anyMatch(i -> i == getErrorCode());
		}

		return b.getBoolean(CarrierConfigManager
		.KEY_RESTART_RADIO_ON_PDP_FAIL_REGULAR_DEACTIVATION_BOOL);
		}
		}

		return false;
		}

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -3051,8 +3051,8 @@ public class DcTracker extends Handler {
		intent.putExtra(TelephonyIntents.EXTRA_APN_TYPE_KEY, apnContext.getApnType());
		mPhone.getCarrierSignalAgent().notifyCarrierSignalReceivers(intent);

		if (cause.isRestartRadioFail(mPhone.getContext(), mPhone.getSubId()) \|\|
		apnContext.restartOnError(cause.getErrorCode())) {
		if (cause.isRadioRestartFailure(mPhone.getContext(), mPhone.getSubId())
		\|\| apnContext.restartOnError(cause.getErrorCode())) {
		if (DBG) log("Modem restarted.");
		sendRestartRadio();
		}

src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -2006,10 +2006,12 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall {
		return DisconnectCause.SERVER_ERROR;

		case ImsReasonInfo.CODE_SIP_SERVICE_UNAVAILABLE:
		case ImsReasonInfo.CODE_SIP_NOT_FOUND:
		case ImsReasonInfo.CODE_SIP_SERVER_ERROR:
		return DisconnectCause.SERVER_UNREACHABLE;

		case ImsReasonInfo.CODE_SIP_NOT_FOUND:
		return DisconnectCause.INVALID_NUMBER;

		case ImsReasonInfo.CODE_LOCAL_NETWORK_ROAMING:
		case ImsReasonInfo.CODE_LOCAL_NETWORK_IP_CHANGED:
		case ImsReasonInfo.CODE_LOCAL_IMS_SERVICE_DOWN: