From 9657c6d4e7177215153c7a729c901c44dfd73160 Mon Sep 17 00:00:00 2001 From: Bevis Tseng Date: Thu, 30 Apr 2015 18:25:11 +0800 Subject: [PATCH] Bug 1114938 - Part 2.3: (Gonk) Remove Implementation from IccProvider. r=echen --- dom/system/gonk/RILContentHelper.js | 134 ------------------------- dom/system/gonk/RadioInterfaceLayer.js | 23 ----- 2 files changed, 157 deletions(-) diff --git a/dom/system/gonk/RILContentHelper.js b/dom/system/gonk/RILContentHelper.js index b27f9f438e4e..846b0e98fcf7 100644 --- a/dom/system/gonk/RILContentHelper.js +++ b/dom/system/gonk/RILContentHelper.js @@ -44,8 +44,6 @@ const RILCONTENTHELPER_CID = Components.ID("{472816e1-1fd6-4405-996c-806f9ea68174}"); const RIL_IPC_MSG_NAMES = [ - "RIL:StkCommand", - "RIL:StkSessionEnd", "RIL:ReadIccContacts", "RIL:UpdateIccContact", ]; @@ -85,7 +83,6 @@ function RILContentHelper() { this.initDOMRequestHelper(/* aWindow */ null, RIL_IPC_MSG_NAMES); this._windowsMap = []; - this._iccListeners = []; Services.obs.addObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID, false); @@ -116,59 +113,6 @@ RILContentHelper.prototype = { * nsIIccProvider */ - sendStkResponse: function(clientId, window, command, response) { - if (window == null) { - throw Components.Exception("Can't get window object", - Cr.NS_ERROR_UNEXPECTED); - } - response.command = command; - cpmm.sendAsyncMessage("RIL:SendStkResponse", { - clientId: clientId, - data: response - }); - }, - - sendStkMenuSelection: function(clientId, window, itemIdentifier, - helpRequested) { - if (window == null) { - throw Components.Exception("Can't get window object", - Cr.NS_ERROR_UNEXPECTED); - } - cpmm.sendAsyncMessage("RIL:SendStkMenuSelection", { - clientId: clientId, - data: { - itemIdentifier: itemIdentifier, - helpRequested: helpRequested - } - }); - }, - - sendStkTimerExpiration: function(clientId, window, timer) { - if (window == null) { - throw Components.Exception("Can't get window object", - Cr.NS_ERROR_UNEXPECTED); - } - cpmm.sendAsyncMessage("RIL:SendStkTimerExpiration", { - clientId: clientId, - data: { - timer: timer - } - }); - }, - - sendStkEventDownload: function(clientId, window, event) { - if (window == null) { - throw Components.Exception("Can't get window object", - Cr.NS_ERROR_UNEXPECTED); - } - cpmm.sendAsyncMessage("RIL:SendStkEventDownload", { - clientId: clientId, - data: { - event: event - } - }); - }, - readContacts: function(clientId, window, contactType) { if (window == null) { throw Components.Exception("Can't get window object", @@ -237,51 +181,6 @@ RILContentHelper.prototype = { return request; }, - _iccListeners: null, - - registerListener: function(listenerType, clientId, listener) { - if (!this[listenerType]) { - return; - } - let listeners = this[listenerType][clientId]; - if (!listeners) { - listeners = this[listenerType][clientId] = []; - } - - if (listeners.indexOf(listener) != -1) { - throw new Error("Already registered this listener!"); - } - - listeners.push(listener); - if (DEBUG) debug("Registered " + listenerType + " listener: " + listener); - }, - - unregisterListener: function(listenerType, clientId, listener) { - if (!this[listenerType]) { - return; - } - let listeners = this[listenerType][clientId]; - if (!listeners) { - return; - } - - let index = listeners.indexOf(listener); - if (index != -1) { - listeners.splice(index, 1); - if (DEBUG) debug("Unregistered listener: " + listener); - } - }, - - registerIccMsg: function(clientId, listener) { - if (DEBUG) debug("Registering for ICC related messages"); - this.registerListener("_iccListeners", clientId, listener); - cpmm.sendAsyncMessage("RIL:RegisterIccMsg"); - }, - - unregisterIccMsg: function(clientId, listener) { - this.unregisterListener("_iccListeners", clientId, listener); - }, - // nsIObserver observe: function(subject, topic, data) { @@ -371,13 +270,6 @@ RILContentHelper.prototype = { let data = msg.json.data; let clientId = msg.json.clientId; switch (msg.name) { - case "RIL:StkCommand": - this._deliverEvent(clientId, "_iccListeners", "notifyStkCommand", - [JSON.stringify(data)]); - break; - case "RIL:StkSessionEnd": - this._deliverEvent(clientId, "_iccListeners", "notifyStkSessionEnd", null); - break; case "RIL:ReadIccContacts": this.handleReadIccContacts(data); break; @@ -442,32 +334,6 @@ RILContentHelper.prototype = { contact.id = iccContact.contactId; this.fireRequestSuccess(message.requestId, contact); - }, - - _deliverEvent: function(clientId, listenerType, name, args) { - if (!this[listenerType]) { - return; - } - let thisListeners = this[listenerType][clientId]; - if (!thisListeners) { - return; - } - - let listeners = thisListeners.slice(); - for (let listener of listeners) { - if (thisListeners.indexOf(listener) == -1) { - continue; - } - let handler = listener[name]; - if (typeof handler != "function") { - throw new Error("No handler for " + name); - } - try { - handler.apply(listener, args); - } catch (e) { - if (DEBUG) debug("listener for " + name + " threw an exception: " + e); - } - } } }; diff --git a/dom/system/gonk/RadioInterfaceLayer.js b/dom/system/gonk/RadioInterfaceLayer.js index db94a502b3b0..b5da83d0d19d 100644 --- a/dom/system/gonk/RadioInterfaceLayer.js +++ b/dom/system/gonk/RadioInterfaceLayer.js @@ -85,13 +85,8 @@ const NETWORK_TYPE_MOBILE_DUN = Ci.nsINetworkInterface.NETWORK_TYPE_MOBILE_DUN; // TODO: Bug 815526, deprecate RILContentHelper. const RIL_IPC_ICCMANAGER_MSG_NAMES = [ - "RIL:SendStkResponse", - "RIL:SendStkMenuSelection", - "RIL:SendStkTimerExpiration", - "RIL:SendStkEventDownload", "RIL:ReadIccContacts", "RIL:UpdateIccContact", - "RIL:RegisterIccMsg", ]; // set to true in ril_consts.js to see debug messages @@ -332,12 +327,6 @@ XPCOMUtils.defineLazyGetter(this, "gMessageManager", function() { return null; } - switch (msg.name) { - case "RIL:RegisterIccMsg": - this._registerMessageTarget("icc", msg.target); - return null; - } - let clientId = msg.json.clientId || 0; let radioInterface = this.ril.getRadioInterface(clientId); if (!radioInterface) { @@ -976,18 +965,6 @@ RadioInterface.prototype = { */ receiveMessage: function(msg) { switch (msg.name) { - case "RIL:SendStkResponse": - this.workerMessenger.send("sendStkTerminalResponse", msg.json.data); - break; - case "RIL:SendStkMenuSelection": - this.workerMessenger.send("sendStkMenuSelection", msg.json.data); - break; - case "RIL:SendStkTimerExpiration": - this.workerMessenger.send("sendStkTimerExpiration", msg.json.data); - break; - case "RIL:SendStkEventDownload": - this.workerMessenger.send("sendStkEventDownload", msg.json.data); - break; case "RIL:ReadIccContacts": this.workerMessenger.sendWithIPCMessage(msg, "readICCContacts"); break;