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 895960 - Part 1: Patch. r=hsinyi

Browse Source
This commit is contained in:
Yoshi Huang 2013-07-23 14:34:30 +08:00
parent fe634908e9
commit 9575de9cae
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10974,21 +10974,17 @@ let ICCRecordHelper = {
} }
Buf.readStringDelimiter(strLen); Buf.readStringDelimiter(strLen);
if (pbrTlvs.length === 0) { if (pbrTlvs.length > 0) {
let error = onerror || debug; let pbr = ICCUtilsHelper.parsePbrTlvs(pbrTlvs);
error("Cannot access Phonebook."); // EF_ADN is mandatory if and only if DF_PHONEBOOK is present.
return; if (!pbr.adn) {
let error = onerror || debug;
error("Cannot access ADN.");
return;
}
pbrs.push(pbr);
} }
let pbr = ICCUtilsHelper.parsePbrTlvs(pbrTlvs);
// EF_ADN is mandatory if and only if DF_PHONEBOOK is present.
if (!pbr.adn) {
let error = onerror || debug;
error("Cannot access ADN.");
return;
}
pbrs.push(pbr);
if (options.p1 < options.totalRecords) { if (options.p1 < options.totalRecords) {
ICCIOHelper.loadNextRecord(options); ICCIOHelper.loadNextRecord(options);
} else { } else {
@ -12414,6 +12410,11 @@ let ICCContactHelper = {
let gotPbrCb = function gotPbrCb(pbrs) { let gotPbrCb = function gotPbrCb(pbrs) {
let pbrIndex = Math.floor(contact.recordId / ICC_MAX_LINEAR_FIXED_RECORDS); let pbrIndex = Math.floor(contact.recordId / ICC_MAX_LINEAR_FIXED_RECORDS);
let pbr = pbrs[pbrIndex]; let pbr = pbrs[pbrIndex];
if (!pbr) {
let error = onerror || debug;
error("Cannot access Phonebook.");
return;
}
this.updatePhonebookSet(pbr, contact, onsuccess, onerror); this.updatePhonebookSet(pbr, contact, onsuccess, onerror);
}.bind(this); }.bind(this);