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

Commit f5fa09ff authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Send retry SMS over 1x"

parents 9cc67c25 c2c16dca

src/java/com/android/internal/telephony/ImsSMSDispatcher.java

+3 −0
Original line number Diff line number Diff line
@@ -233,6 +233,7 @@ public class ImsSMSDispatcher extends SMSDispatcher { 
        if (oldFormat.equals(newFormat)) {

            if (isCdmaFormat(newFormat)) {

                Rlog.d(TAG, "old format matched new format (cdma)");

                shouldSendSmsOverIms();

                mCdmaDispatcher.sendSms(tracker);

                return;

            } else {
@@ -275,6 +276,7 @@ public class ImsSMSDispatcher extends SMSDispatcher { 
                Rlog.d(TAG, "old format (gsm) ==> new format (cdma)");

                pdu = com.android.internal.telephony.cdma.SmsMessage.getSubmitPdu(

                        scAddr, destAddr, text, (tracker.mDeliveryIntent != null), null);

                shouldSendSmsOverIms();

            } else {

                Rlog.d(TAG, "old format (cdma) ==> new format (gsm)");

                pdu = com.android.internal.telephony.gsm.SmsMessage.getSubmitPdu(
@@ -290,6 +292,7 @@ public class ImsSMSDispatcher extends SMSDispatcher { 
                pdu = com.android.internal.telephony.cdma.SmsMessage.getSubmitPdu(

                            scAddr, destAddr, destPort.intValue(), data,

                            (tracker.mDeliveryIntent != null));

                shouldSendSmsOverIms();

            } else {

                Rlog.d(TAG, "old format (cdma) ==> new format (gsm)");

                pdu = com.android.internal.telephony.gsm.SmsMessage.getSubmitPdu(