Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82ee5985 authored by Sukanya Rajkhowa's avatar Sukanya Rajkhowa Committed by Gerrit - the friendly Code Review server
Browse files

Revert "Send SMS over 1x when on eHRPD/LTE and active voice call" 

This reverts commit 4eb8e4c8.

The functionality implemented by this change is already there in our internal
change (e87a8e9e7cd6f645a051b5446f27eb547a4de636)
The problem with this change is that it assumes that for a 3gpp2 operator,
the sms format will always be 3gpp2 even on IMS which may not be so.
In such a case, this change won't work. Also, this change has one additional
conditional check for LTE + no concurrent voice and data allowed which is taken
care of by our modem

CRs-Fixed: 750718

Change-Id: Ic953299e5f1db518a3268c5203d51dffbe370408
parent 2b30225d

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