Merge "Telephony: Set TP-RD to 1 in case of retry" (958e7316) · Commits · e / os / android_frameworks_opt_telephony

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);
		}

+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);
		}