wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 859220 - Part 3: Separate IPC messages in RadioInterfaceLayer. r=allstars.chh

Browse Source
This commit is contained in:
Edgar Chen 2013-04-09 14:18:43 +08:00
parent f95fb00c65
commit edee3e5ee8
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
dom/system/gonk/RadioInterfaceLayer.js
View File

@ -92,6 +92,14 @@ const RIL_IPC_MOBILECONNECTION_MSG_NAMES = [
"RIL:SetCardLock",
"RIL:SendMMI",
"RIL:CancelMMI",
"RIL:RegisterMobileConnectionMsg",
"RIL:SetCallForwardingOption",
"RIL:GetCallForwardingOption",
"RIL:SetCallWaitingOption",
"RIL:GetCallWaitingOption"
];
const RIL_IPC_ICCMANAGER_MSG_NAMES = [
"RIL:SendStkResponse",
"RIL:SendStkMenuSelection",
"RIL:SendStkTimerExpiration",
@ -101,12 +109,7 @@ const RIL_IPC_MOBILECONNECTION_MSG_NAMES = [
"RIL:IccCloseChannel",
"RIL:ReadIccContacts",
"RIL:UpdateIccContact",
"RIL:RegisterMobileConnectionMsg",
"RIL:RegisterIccMsg",
"RIL:SetCallForwardingOption",
"RIL:GetCallForwardingOption",
"RIL:SetCallWaitingOption",
"RIL:GetCallWaitingOption"
"RIL:RegisterIccMsg"
];
const RIL_IPC_VOICEMAIL_MSG_NAMES = [
@ -332,6 +335,9 @@ function RadioInterfaceLayer() {
for (let msgname of RIL_IPC_MOBILECONNECTION_MSG_NAMES) {
ppmm.addMessageListener(msgname, this);
}
for (let msgName of RIL_IPC_ICCMANAGER_MSG_NAMES) {
ppmm.addMessageListener(msgName, this);
}
for (let msgname of RIL_IPC_VOICEMAIL_MSG_NAMES) {
ppmm.addMessageListener(msgname, this);
}
@ -392,6 +398,12 @@ RadioInterfaceLayer.prototype = {
" from a content process with no 'mobileconnection' privileges.");
return null;
}
} else if (RIL_IPC_ICCMANAGER_MSG_NAMES.indexOf(msg.name) != -1) {
if (!msg.target.assertPermission("mobileconnection")) {
debug("IccManager message " + msg.name +
" from a content process with no 'mobileconnection' privileges.");
return null;
}
} else if (RIL_IPC_VOICEMAIL_MSG_NAMES.indexOf(msg.name) != -1) {
if (!msg.target.assertPermission("voicemail")) {
debug("Voicemail message " + msg.name +
@ -1905,6 +1917,9 @@ RadioInterfaceLayer.prototype = {
for (let msgname of RIL_IPC_MOBILECONNECTION_MSG_NAMES) {
ppmm.removeMessageListener(msgname, this);
}
for (let msgName of RIL_IPC_ICCMANAGER_MSG_NAMES) {
ppmm.removeMessageListener(msgName, this);
}
for (let msgname of RIL_IPC_VOICEMAIL_MSG_NAMES) {
ppmm.removeMessageListener(msgname, this);
}