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

Commit 454c5783 authored by Rika Brooks's avatar Rika Brooks
Browse files

Telephony: Set TP-RD to 1 in case of retry 

per TS 23.040 Section 9.2.3.6: In the case where no response or an
RP-ERROR with an appropriate cause value (see 3GPP TS 24.011 [13]) is
received in response to an SMS-SUBMIT, then the MS shall automatically
repeat the SMS-SUBMIT but must use the same TP-MR value
and set the TP-RD bit to 1 (see 9.2.3.25)

Bug:  8323645
Change-Id: I1c7ebc67f80a6eeba456ab0dc5f6331a038d7ab2
parent 5779b57f

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

+6 −2
Original line number Diff line number Diff line
@@ -424,6 +424,12 @@ public abstract class SMSDispatcher extends Handler { 
        SmsTracker tracker = (SmsTracker) ar.userObj;

        PendingIntent sentIntent = tracker.mSentIntent;



        if (ar.result != null) {

            tracker.mMessageRef = ((SmsResponse)ar.result).messageRef;

        } else {

            Rlog.d(TAG, "SmsResponse was null");

        }



        if (ar.exception == null) {

            if (false) {

                Rlog.d(TAG, "SMS send complete. Broadcasting "
@@ -432,8 +438,6 @@ public abstract class SMSDispatcher extends Handler { 


            if (tracker.mDeliveryIntent != null) {

                // Expecting a status report.  Add it to the list.

                int messageRef = ((SmsResponse)ar.result).messageRef;

                tracker.mMessageRef = messageRef;

                deliveryPendingList.add(tracker);

            }

src/java/com/android/internal/telephony/gsm/GsmSMSDispatcher.java

+15 −0
Original line number Diff line number Diff line
@@ -294,6 +294,21 @@ public final class GsmSMSDispatcher extends SMSDispatcher { 
        byte pdu[] = (byte[]) map.get("pdu");



        Message reply = obtainMessage(EVENT_SEND_SMS_COMPLETE, tracker);



        if (tracker.mRetryCount > 0) {

            Rlog.d(TAG, "sendSms: "

                    + " mRetryCount=" + tracker.mRetryCount

                    + " mMessageRef=" + tracker.mMessageRef

                    + " SS=" + mPhone.getServiceState().getState());



            // per TS 23.040 Section 9.2.3.6:  If TP-MTI SMS-SUBMIT (0x01) type

            //   TP-RD (bit 2) is 1 for retry

            //   and TP-MR is set to previously failed sms TP-MR

            if (((0x01 & pdu[0]) == 0x01)) {

                pdu[0] |= 0x04; // TP-RD

                pdu[1] = (byte) tracker.mMessageRef; // TP-MR

            }

        }

        mCm.sendSMS(IccUtils.bytesToHexString(smsc), IccUtils.bytesToHexString(pdu), reply);

    }