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 852815 - Correct Icc related naming in RadioInterfaceLayer and RILContentHelper. r=allstars.chh

Browse Source
This commit is contained in:
Edgar Chen 2013-03-25 11:09:01 +08:00
parent 120198a55b
commit c7f0bb70c5
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dom/system/gonk/RILContentHelper.js
View File

@ -82,7 +82,7 @@ const RIL_IPC_MSG_NAMES = [
"RIL:IccOpenChannel",
"RIL:IccCloseChannel",
"RIL:IccExchangeAPDU",
"RIL:IccUpdateContact"
"RIL:UpdateIccContact"
];
XPCOMUtils.defineLazyServiceGetter(this, "cpmm",
@ -676,7 +676,7 @@ RILContentHelper.prototype = {
iccContact.number = contact.tel[0].value;
}
cpmm.sendAsyncMessage("RIL:IccUpdateContact", {requestId: requestId,
cpmm.sendAsyncMessage("RIL:UpdateIccContact", {requestId: requestId,
contactType: contactType,
contact: iccContact,
pin2: pin2});
@ -1086,8 +1086,8 @@ RILContentHelper.prototype = {
case "RIL:IccExchangeAPDU":
this.handleIccExchangeAPDU(msg.json);
break;
case "RIL:IccUpdateContact":
this.handleIccUpdateContact(msg.json);
case "RIL:UpdateIccContact":
this.handleUpdateIccContact(msg.json);
break;
case "RIL:DataError":
this.updateConnectionInfo(msg.json, this.rilContext.dataConnectionInfo);
@ -1200,7 +1200,7 @@ RILContentHelper.prototype = {
}
},
handleIccUpdateContact: function handleIccUpdateContact(message) {
handleUpdateIccContact: function handleUpdateIccContact(message) {
if (message.errorMsg) {
this.fireRequestError(message.requestId, message.errorMsg);
} else {

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

@ -99,7 +99,7 @@ const RIL_IPC_MOBILECONNECTION_MSG_NAMES = [
"RIL:IccOpenChannel",
"RIL:IccExchangeAPDU",
"RIL:IccCloseChannel",
"RIL:IccUpdateContact",
"RIL:UpdateIccContact",
"RIL:RegisterMobileConnectionMsg",
"RIL:RegisterIccMsg",
"RIL:SetCallForwardingOption",
@ -511,9 +511,9 @@ RadioInterfaceLayer.prototype = {
this.saveRequestTarget(msg);
this.iccExchangeAPDU(msg.json);
break;
case "RIL:IccUpdateContact":
case "RIL:UpdateIccContact":
this.saveRequestTarget(msg);
this.updateICCContact(msg.json);
this.updateIccContact(msg.json);
break;
case "RIL:RegisterMobileConnectionMsg":
this.registerMessageTarget("mobileconnection", msg.target);
@ -657,7 +657,7 @@ RadioInterfaceLayer.prototype = {
this.handleNitzTime(message);
break;
case "iccinfochange":
this.handleICCInfoChange(message);
this.handleIccInfoChange(message);
break;
case "iccimsi":
this.rilContext.imsi = message.imsi;
@ -665,7 +665,7 @@ RadioInterfaceLayer.prototype = {
case "iccGetCardLock":
case "iccSetCardLock":
case "iccUnlockCardLock":
this.handleICCCardLockResult(message);
this.handleIccCardLockResult(message);
break;
case "icccontacts":
if (!this._contactsCallbacks) {
@ -680,10 +680,10 @@ RadioInterfaceLayer.prototype = {
}
break;
case "icccontactupdate":
this.handleIccUpdateContact(message);
this.handleUpdateIccContact(message);
break;
case "iccmbdn":
this.handleICCMbdn(message);
this.handleIccMbdn(message);
break;
case "USSDReceived":
debug("USSDReceived " + JSON.stringify(message));
@ -1398,9 +1398,9 @@ RadioInterfaceLayer.prototype = {
this._sendRequestResults("RIL:EnumerateCalls", options);
},
handleIccUpdateContact: function handleIccUpdateContact(message) {
debug("handleIccUpdateContact: " + JSON.stringify(message));
this._sendRequestResults("RIL:IccUpdateContact", message);
handleUpdateIccContact: function handleUpdateIccContact(message) {
debug("handleUpdateIccContact: " + JSON.stringify(message));
this._sendRequestResults("RIL:UpdateIccContact", message);
},
/**
@ -1777,7 +1777,7 @@ RadioInterfaceLayer.prototype = {
}
},
handleICCMbdn: function handleICCMbdn(message) {
handleIccMbdn: function handleIccMbdn(message) {
let voicemailInfo = this.voicemailInfo;
voicemailInfo.number = message.number;
@ -1786,7 +1786,7 @@ RadioInterfaceLayer.prototype = {
this._sendVoicemailMessage("RIL:VoicemailInfoChanged", voicemailInfo);
},
handleICCInfoChange: function handleICCInfoChange(message) {
handleIccInfoChange: function handleIccInfoChange(message) {
let oldIccInfo = this.rilContext.iccInfo;
this.rilContext.iccInfo = message;
@ -1823,7 +1823,7 @@ RadioInterfaceLayer.prototype = {
}
},
handleICCCardLockResult: function handleICCCardLockResult(message) {
handleIccCardLockResult: function handleIccCardLockResult(message) {
this._sendRequestResults("RIL:CardLockResult", message);
},
@ -2898,7 +2898,7 @@ RadioInterfaceLayer.prototype = {
requestId: requestId});
},
updateICCContact: function updateICCContact(message) {
updateIccContact: function updateIccContact(message) {
message.rilMessageType = "updateICCContact";
this.worker.postMessage(message);
},