Bug 946081 - [B2G][SMS] Store MWI Message Into Message Inbox if MWI is Store Message Type. r=vyang
authorBevis Tseng <btseng@mozilla.com>
Fri, 06 Dec 2013 11:18:17 +0800
changeset 175181 b8cc4dd54e13f8ebbd7507a3ba9c3664e1d6c96a
parent 175180 eed15c7bdf2eb1603c7f4de21910a1a8c9566070
child 175182 0204febd31467c1cd357728a45c0e3e508487fd8
child 176555 c1a13692027d56222707e85fa6e5ff762fbd15cd
push id445
push userffxbld
push dateMon, 10 Mar 2014 22:05:19 +0000
treeherdermozilla-release@dc38b741b04e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersvyang
bugs946081
milestone28.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 946081 - [B2G][SMS] Store MWI Message Into Message Inbox if MWI is Store Message Type. r=vyang
dom/system/gonk/RadioInterfaceLayer.js
--- a/dom/system/gonk/RadioInterfaceLayer.js
+++ b/dom/system/gonk/RadioInterfaceLayer.js
@@ -2051,17 +2051,22 @@ RadioInterface.prototype = {
     // See TS 23.040 9.2.3.24.2
 
     let mwi = message.mwi;
     if (mwi) {
       mwi.returnNumber = message.sender;
       mwi.returnMessage = message.fullBody;
       gMessageManager.sendVoicemailMessage("RIL:VoicemailNotification",
                                            this.clientId, mwi);
-      return true;
+
+      // Dicarded MWI comes without text body.
+      // Hence, we discard it here after notifying the MWI status.
+      if (mwi.discard) {
+        return true;
+      }
     }
 
     let notifyReceived = function notifyReceived(rv, domMessage) {
       let success = Components.isSuccessCode(rv);
 
       // Acknowledge the reception of the SMS.
       // Note: Ack has been done by modem for NEW_SMS_ON_SIM
       if (message.simStatus === undefined) {