Merge "Revert "Send SMS over 1x when on eHRPD/LTE and active voice call"" (166dae33) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java

+1 −11

Original line number	Diff line number	Diff line
		@@ -42,8 +42,6 @@ import com.android.internal.telephony.SmsHeader;
		import com.android.internal.telephony.SmsUsageMonitor;
		import com.android.internal.telephony.TelephonyProperties;
		import com.android.internal.telephony.cdma.sms.UserData;
		import com.android.internal.telephony.PhoneConstants;
		import android.telephony.TelephonyManager;

		import java.util.HashMap;
		import java.util.concurrent.atomic.AtomicBoolean;
		@@ -273,19 +271,11 @@ public class CdmaSMSDispatcher extends SMSDispatcher {
		Message reply = obtainMessage(EVENT_SEND_SMS_COMPLETE, tracker);
		byte[] pdu = (byte[]) tracker.mData.get("pdu");

		int currentDataNetwork = mPhone.getServiceState().getDataNetworkType();
		boolean imsSmsDisabled = (currentDataNetwork == TelephonyManager.NETWORK_TYPE_EHRPD
		\|\| (currentDataNetwork == TelephonyManager.NETWORK_TYPE_LTE
		&& !mPhone.getServiceStateTracker().isConcurrentVoiceAndDataAllowed()))
		&& mPhone.getServiceState().getVoiceNetworkType()
		== TelephonyManager.NETWORK_TYPE_1xRTT
		&& mPhone.getState() != PhoneConstants.State.IDLE;

		// sms over cdma is used:
		// if sms over IMS is not supported AND
		// this is not a retry case after sms over IMS failed
		// indicated by mImsRetry > 0
		if (0 == tracker.mImsRetry && !isIms() \|\| imsSmsDisabled) {
		if (0 == tracker.mImsRetry && !isIms()) {
		mCi.sendCdmaSms(pdu, reply);
		}
		// If sending SMS over IMS is not enabled, send SMS over cdma. Simply