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

merge b2g-inbound to mozilla-central

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2014-01-08 13:17:30 +01:00
commit bf625cfaf0
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
b2g/config/gaia.json
View File

@ -1,4 +1,4 @@
{
"revision": "9960daf91c384990c4bbe7c1221905db7536596b",
"revision": "65400ea2bb3e99ad717f4b99e24ebbfa23b05b58",
"repo_path": "/integration/gaia-central"
}

24
dom/mobilemessage/src/gonk/MmsService.js
View File

@ -2272,7 +2272,17 @@ MmsService.prototype = {
// which could fail when the corresponding SIM card isn't installed.
let serviceId;
try {
serviceId = gRil.getClientIdByIccId(aMessageRecord.iccId);
if (aMessageRecord.iccId == null) {
// If the ICC ID isn't available, it means the MMS has been received
// during the previous version that didn't take the DSDS scenario
// into consideration. Tentatively, setting the service ID to be 0 by
// default is better than nothing. Although it might use the wrong
// SIM to download the desired MMS, eventually it would still fail to
// download due to the wrong MMSC and proxy settings.
serviceId = 0;
} else {
serviceId = gRil.getClientIdByIccId(aMessageRecord.iccId);
}
} catch (e) {
if (DEBUG) debug("RIL service is not available for ICC ID.");
aRequest.notifyGetMessageFailed(Ci.nsIMobileMessageCallback.NO_SIM_CARD_ERROR);
@ -2410,7 +2420,17 @@ MmsService.prototype = {
// which could fail when the corresponding SIM card isn't installed.
let serviceId;
try {
serviceId = gRil.getClientIdByIccId(iccId);
if (iccId == null) {
// If the ICC ID isn't available, it means the MMS has been received
// during the previous version that didn't take the DSDS scenario
// into consideration. Tentatively, setting the service ID to be 0 by
// default is better than nothing. Although it might use the wrong
// SIM to send the read report for the desired MMS, eventually it
// would still fail to send due to the wrong MMSC and proxy settings.
serviceId = 0;
} else {
serviceId = gRil.getClientIdByIccId(iccId);
}
} catch (e) {
if (DEBUG) debug("RIL service is not available for ICC ID.");
return;