From 9abce82c28b49b618378f5c8b98b587223e1ccad Mon Sep 17 00:00:00 2001 From: Bevis Tseng Date: Fri, 6 Dec 2013 17:35:13 +0800 Subject: [PATCH] Bug 768441 - Part 1: Support Stored Message Waiting Indicators. r=vyang --- dom/system/gonk/RadioInterfaceLayer.js | 9 ++- dom/system/gonk/ril_consts.js | 2 + dom/system/gonk/ril_worker.js | 99 ++++++++++++++++++++++++++ 3 files changed, 105 insertions(+), 5 deletions(-) diff --git a/dom/system/gonk/RadioInterfaceLayer.js b/dom/system/gonk/RadioInterfaceLayer.js index bc8c57a45dc1..94c36dbc29e4 100644 --- a/dom/system/gonk/RadioInterfaceLayer.js +++ b/dom/system/gonk/RadioInterfaceLayer.js @@ -1258,6 +1258,10 @@ RadioInterface.prototype = { case "iccmbdn": this.handleIccMbdn(message); break; + case "iccmwis": + gMessageManager.sendVoicemailMessage("RIL:VoicemailNotification", + this.clientId, message.mwi); + break; case "USSDReceived": if (DEBUG) this.debug("USSDReceived " + JSON.stringify(message)); this.handleUSSDReceived(message); @@ -2104,11 +2108,6 @@ RadioInterface.prototype = { return true; } - // TODO: Bug #768441 - // For now we don't store indicators persistently. When the mwi.discard - // flag is false, we'll need to persist the indicator to EFmwis. - // See TS 23.040 9.2.3.24.2 - let mwi = message.mwi; if (mwi) { mwi.returnNumber = message.sender; diff --git a/dom/system/gonk/ril_consts.js b/dom/system/gonk/ril_consts.js index cf5efc67ec23..c4a68eb2faaa 100644 --- a/dom/system/gonk/ril_consts.js +++ b/dom/system/gonk/ril_consts.js @@ -1206,6 +1206,7 @@ this.GECKO_ICC_SERVICES = { PNN: 51, OPL: 52, MDN: 53, + MWIS: 54, SPDI: 56 }, usim: { @@ -1221,6 +1222,7 @@ this.GECKO_ICC_SERVICES = { PNN: 45, OPL: 46, MDN: 47, + MWIS: 48, SPDI: 51 }, ruim: { diff --git a/dom/system/gonk/ril_worker.js b/dom/system/gonk/ril_worker.js index a2aec4132c02..ff6b04343b8c 100644 --- a/dom/system/gonk/ril_worker.js +++ b/dom/system/gonk/ril_worker.js @@ -4206,6 +4206,11 @@ let RIL = { this.sendChromeMessage(message); + // Update MWI Status into ICC if present. + if (message.mwi && ICCUtilsHelper.isICCServiceAvailable("MWIS")) { + SimRecordHelper.updateMWIS(message.mwi); + } + // We will acknowledge receipt of the SMS after we try to store it // in the database. return MOZ_FCS_WAIT_FOR_EXPLICIT_ACK; @@ -10937,6 +10942,7 @@ let ICCFileHelper = { return EF_PATH_MF_SIM + EF_PATH_DF_TELECOM; case ICC_EF_AD: case ICC_EF_MBDN: + case ICC_EF_MWIS: case ICC_EF_PLMNsel: case ICC_EF_SPN: case ICC_EF_SPDI: @@ -10961,6 +10967,7 @@ let ICCFileHelper = { case ICC_EF_AD: case ICC_EF_FDN: case ICC_EF_MBDN: + case ICC_EF_MWIS: case ICC_EF_UST: case ICC_EF_MSISDN: case ICC_EF_SPN: @@ -11916,6 +11923,13 @@ let SimRecordHelper = { if (DEBUG) debug("MDN: MDN service is not available"); } + if (ICCUtilsHelper.isICCServiceAvailable("MWIS")) { + if (DEBUG) debug("MWIS: MWIS is available"); + this.readMWIS(); + } else { + if (DEBUG) debug("MWIS: MWIS is not available"); + } + if (ICCUtilsHelper.isICCServiceAvailable("SPDI")) { if (DEBUG) debug("SPDI: SPDI available."); this.readSPDI(); @@ -11985,6 +11999,91 @@ let SimRecordHelper = { callback: callback.bind(this)}); }, + /** + * Read ICC MWIS. (Message Waiting Indication Status) + * + * @see TS 31.102, clause 4.2.63 for USIM and TS 51.011, clause 10.3.45 for SIM. + */ + readMWIS: function readMWIS() { + function callback(options) { + let strLen = Buf.readInt32(); + // Each octet is encoded into two chars. + let octetLen = strLen / 2; + let mwis = GsmPDUHelper.readHexOctetArray(octetLen); + Buf.readStringDelimiter(strLen); + if (!mwis) { + return; + } + RIL.iccInfoPrivate.mwis = mwis; //Keep raw MWIS for updateMWIS() + + let mwi = {}; + // b8 b7 B6 b5 b4 b3 b2 b1 4.2.63, TS 31.102 version 11.6.0 + // | | | | | | | |__ Voicemail + // | | | | | | |_____ Fax + // | | | | | |________ Electronic Mail + // | | | | |___________ Other + // | | | |______________ Videomail + // |__|__|_________________ RFU + mwi.active = ((mwis[0] & 0x01) != 0); + + if (mwi.active) { + // In TS 23.040 msgCount is in the range from 0 to 255. + // The value 255 shall be taken to mean 255 or greater. + // + // However, There is no definition about 0 when MWI is active. + // + // Normally, when mwi is active, the msgCount must be larger than 0. + // Refer to other reference phone, + // 0 is usually treated as UNKNOWN for storing 2nd level MWI status (DCS). + mwi.msgCount = (mwis[1] === 0) ? GECKO_VOICEMAIL_MESSAGE_COUNT_UNKNOWN + : mwis[1]; + } else { + mwi.msgCount = 0; + } + + RIL.sendChromeMessage({ rilMessageType: "iccmwis", + mwi: mwi }); + } + + ICCIOHelper.loadLinearFixedEF({ fileId: ICC_EF_MWIS, + recordNumber: 1, // Get 1st Subscriber Profile. + callback: callback }); + }, + + /** + * Update ICC MWIS. (Message Waiting Indication Status) + * + * @see TS 31.102, clause 4.2.63 for USIM and TS 51.011, clause 10.3.45 for SIM. + */ + updateMWIS: function updateMWIS(mwi) { + if (!RIL.iccInfoPrivate.mwis) { + return; + } + + function dataWriter(recordSize) { + let mwis = RIL.iccInfoPrivate.mwis; + + let msgCount = + (mwi.msgCount === GECKO_VOICEMAIL_MESSAGE_COUNT_UNKNOWN) ? 0 : mwi.msgCount; + + [mwis[0], mwis[1]] = (mwi.active) ? [(mwis[0] | 0x01), msgCount] + : [(mwis[0] & 0xFE), 0]; + + let strLen = recordSize * 2; + Buf.writeInt32(strLen); + + for (let i = 0; i < mwis.length; i++) { + GsmPDUHelper.writeHexOctet(mwis[i]); + } + + Buf.writeStringDelimiter(strLen); + } + + ICCIOHelper.updateLinearFixedEF({ fileId: ICC_EF_MWIS, + recordNumber: 1, // Update 1st Subscriber Profile. + dataWriter: dataWriter }); + }, + /** * Read the SPDI (Service Provider Display Information) from the (U)SIM. *