Bug 975356 - Append iccId into the message sent by SystemMessenger. r=vyang
authorBevis Tseng <btseng@mozilla.com>
Mon, 24 Feb 2014 18:34:06 +0800
changeset 170809 d7cab734473a16b7120e2a40c033f95c1d2409ba
parent 170808 d24400999f17e29d63b8cdf5dde70872281878b7
child 170810 50cf229154c8e2c72ae71177973703e7b50d8b49
push id270
push userpvanderbeken@mozilla.com
push dateThu, 06 Mar 2014 09:24:21 +0000
reviewersvyang
bugs975356
milestone30.0a1
Bug 975356 - Append iccId into the message sent by SystemMessenger. r=vyang
dom/mobilemessage/src/gonk/MmsService.js
dom/system/gonk/RadioInterfaceLayer.js
--- a/dom/mobilemessage/src/gonk/MmsService.js
+++ b/dom/mobilemessage/src/gonk/MmsService.js
@@ -1573,30 +1573,32 @@ MmsService.prototype = {
    */
   broadcastMmsSystemMessage: function(aName, aDomMessage) {
     if (DEBUG) debug("Broadcasting the MMS system message: " + aName);
 
     // Sadly we cannot directly broadcast the aDomMessage object
     // because the system message mechamism will rewrap the object
     // based on the content window, which needs to know the properties.
     gSystemMessenger.broadcastMessage(aName, {
-      type:          aDomMessage.type,
-      id:            aDomMessage.id,
-      threadId:      aDomMessage.threadId,
-      delivery:      aDomMessage.delivery,
-      deliveryInfo:  aDomMessage.deliveryInfo,
-      sender:        aDomMessage.sender,
-      receivers:     aDomMessage.receivers,
-      timestamp:     aDomMessage.timestamp,
-      sentTimestamp: aDomMessage.sentTimestamp,
-      read:          aDomMessage.read,
-      subject:       aDomMessage.subject,
-      smil:          aDomMessage.smil,
-      attachments:   aDomMessage.attachments,
-      expiryDate:    aDomMessage.expiryDate
+      iccId:               aDomMessage.iccId,
+      type:                aDomMessage.type,
+      id:                  aDomMessage.id,
+      threadId:            aDomMessage.threadId,
+      delivery:            aDomMessage.delivery,
+      deliveryInfo:        aDomMessage.deliveryInfo,
+      sender:              aDomMessage.sender,
+      receivers:           aDomMessage.receivers,
+      timestamp:           aDomMessage.timestamp,
+      sentTimestamp:       aDomMessage.sentTimestamp,
+      read:                aDomMessage.read,
+      subject:             aDomMessage.subject,
+      smil:                aDomMessage.smil,
+      attachments:         aDomMessage.attachments,
+      expiryDate:          aDomMessage.expiryDate,
+      readReportRequested: aDomMessage.readReportRequested
     });
   },
 
   /**
    * A helper function to broadcast system message and notify observers that
    * an MMS is sent.
    *
    * @params aDomMessage
--- a/dom/system/gonk/RadioInterfaceLayer.js
+++ b/dom/system/gonk/RadioInterfaceLayer.js
@@ -2794,16 +2794,17 @@ RadioInterface.prototype = {
    */
   broadcastSmsSystemMessage: function(aName, aDomMessage) {
     if (DEBUG) this.debug("Broadcasting the SMS system message: " + aName);
 
     // Sadly we cannot directly broadcast the aDomMessage object
     // because the system message mechamism will rewrap the object
     // based on the content window, which needs to know the properties.
     gSystemMessenger.broadcastMessage(aName, {
+      iccId:             aDomMessage.iccId,
       type:              aDomMessage.type,
       id:                aDomMessage.id,
       threadId:          aDomMessage.threadId,
       delivery:          aDomMessage.delivery,
       deliveryStatus:    aDomMessage.deliveryStatus,
       sender:            aDomMessage.sender,
       receiver:          aDomMessage.receiver,
       body:              aDomMessage.body,