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

Commit 1372f044 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am 5086c457: am baaaca1c: Merge ee4c17ee from gingerbread 

* commit '5086c457':
  Fix delivery report error with PENDING status in SMS
parents 7e0f69db 5086c457

core/java/android/provider/Telephony.java

100644 → 100755
+2 −2
Original line number Diff line number Diff line
@@ -115,8 +115,8 @@ public final class Telephony { 


        public static final int STATUS_NONE = -1;

        public static final int STATUS_COMPLETE = 0;

        public static final int STATUS_PENDING = 64;

        public static final int STATUS_FAILED = 128;

        public static final int STATUS_PENDING = 32;

        public static final int STATUS_FAILED = 64;



        /**

         * The subject of the message, if present

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

100644 → 100755
+6 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.content.Intent; 
import android.os.AsyncResult;

import android.os.Message;

import android.os.SystemProperties;

import android.provider.Telephony.Sms;

import android.provider.Telephony.Sms.Intents;

import android.telephony.ServiceState;

import android.telephony.SmsCbMessage;
@@ -69,13 +70,17 @@ final class GsmSMSDispatcher extends SMSDispatcher { 
        String pduString = (String) ar.result;

        SmsMessage sms = SmsMessage.newFromCDS(pduString);



        int tpStatus = sms.getStatus();



        if (sms != null) {

            int messageRef = sms.messageRef;

            for (int i = 0, count = deliveryPendingList.size(); i < count; i++) {

                SmsTracker tracker = deliveryPendingList.get(i);

                if (tracker.mMessageRef == messageRef) {

                    // Found it.  Remove from list and broadcast.

                    if(tpStatus >= Sms.STATUS_FAILED || tpStatus < Sms.STATUS_PENDING ) {

                       deliveryPendingList.remove(i);

                    }

                    PendingIntent intent = tracker.mDeliveryIntent;

                    Intent fillIn = new Intent();

                    fillIn.putExtra("pdu", IccUtils.hexStringToBytes(pduString));