Merge "Add "format" extra to SMS delivery report intents."

Author: Jake Hamby

telephony/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java

@@ -88,6 +88,7 @@ private void handleCdmaStatusReport(SmsMessage sms) {
                 PendingIntent intent = tracker.mDeliveryIntent;
                 Intent fillIn = new Intent();
                 fillIn.putExtra("pdu", sms.getPdu());
+                fillIn.putExtra("format", android.telephony.SmsMessage.FORMAT_3GPP2);
                 try {
                     intent.send(mContext, Activity.RESULT_OK, fillIn);
                 } catch (CanceledException ex) {}

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

@@ -122,6 +122,7 @@ private void handleStatusReport(AsyncResult ar) {
                     PendingIntent intent = tracker.mDeliveryIntent;
                     Intent fillIn = new Intent();
                     fillIn.putExtra("pdu", IccUtils.hexStringToBytes(pduString));
+                    fillIn.putExtra("format", android.telephony.SmsMessage.FORMAT_3GPP);
                     try {
                         intent.send(mContext, Activity.RESULT_OK, fillIn);
                     } catch (CanceledException ex) {}