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 849725: remove RIL.iccInfoPrivate.SPN.spn. r=allstars.chh

Browse Source
This commit is contained in:
Patrick Wang 2013-05-14 11:32:16 +08:00
parent a9a19a363a
commit 31bbc66fb6
3 changed files with 18 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10170,10 +10170,7 @@ let ICCRecordHelper = {
", spnDisplayCondition = " + spnDisplayCondition); ", spnDisplayCondition = " + spnDisplayCondition);
} }
RIL.iccInfoPrivate.SPN = { RIL.iccInfoPrivate.spnDisplayCondition = spnDisplayCondition;
spn : spn,
spnDisplayCondition : spnDisplayCondition,
};
RIL.iccInfo.spn = spn; RIL.iccInfo.spn = spn;
ICCUtilsHelper.updateDisplayCondition(); ICCUtilsHelper.updateDisplayCondition();
ICCUtilsHelper.handleICCInfoChange(); ICCUtilsHelper.handleICCInfoChange();
@ -11138,11 +11135,11 @@ let ICCUtilsHelper = {
// isDisplaySpnRequired = false // isDisplaySpnRequired = false
let iccInfo = RIL.iccInfo; let iccInfo = RIL.iccInfo;
let iccInfoPriv = RIL.iccInfoPrivate; let iccInfoPriv = RIL.iccInfoPrivate;
let iccSpn = iccInfoPriv.SPN; let displayCondition = iccInfoPriv.spnDisplayCondition;
let origIsDisplayNetworkNameRequired = iccInfo.isDisplayNetworkNameRequired; let origIsDisplayNetworkNameRequired = iccInfo.isDisplayNetworkNameRequired;
let origIsDisplaySPNRequired = iccInfo.isDisplaySpnRequired; let origIsDisplaySPNRequired = iccInfo.isDisplaySpnRequired;
if (!iccSpn) { if (displayCondition === undefined) {
iccInfo.isDisplayNetworkNameRequired = true; iccInfo.isDisplayNetworkNameRequired = true;
iccInfo.isDisplaySpnRequired = false; iccInfo.isDisplaySpnRequired = false;
} else if (RIL._isCdma) { } else if (RIL._isCdma) {
@ -11153,9 +11150,9 @@ let ICCUtilsHelper = {
iccInfo.isDisplayNetworkNameRequired = false; iccInfo.isDisplayNetworkNameRequired = false;
// If display condition is false, we don't even need to check network id // If display condition is 0x0, we don't even need to check network id
// or system id. // or system id.
if (iccSpn.spnDisplayCondition == false) { if (displayCondition == 0x0) {
iccInfo.isDisplaySpnRequired = false; iccInfo.isDisplaySpnRequired = false;
} else { } else {
// CDMA SPN Display condition dosen't specify whenever network name is // CDMA SPN Display condition dosen't specify whenever network name is
@ -11227,11 +11224,7 @@ let ICCUtilsHelper = {
// EF_SPDI contains a list of PLMNs in which the Service Provider Name // EF_SPDI contains a list of PLMNs in which the Service Provider Name
// shall be displayed. // shall be displayed.
iccInfo.isDisplaySpnRequired = true; iccInfo.isDisplaySpnRequired = true;
if (iccSpn.spnDisplayCondition & 0x01) { iccInfo.isDisplayNetworkNameRequired = (displayCondition & 0x01) != 0;
iccInfo.isDisplayNetworkNameRequired = true;
} else {
iccInfo.isDisplayNetworkNameRequired = false;
}
} else { } else {
// The second bit of display condition tells us if we should display // The second bit of display condition tells us if we should display
// registered PLMN. // registered PLMN.
@ -11240,13 +11233,8 @@ let ICCUtilsHelper = {
// We didn't found the requirement of displaying network name if // We didn't found the requirement of displaying network name if
// current PLMN isn't HPLMN nor one of PLMN in SPDI. So we keep // current PLMN isn't HPLMN nor one of PLMN in SPDI. So we keep
// isDisplayNetworkNameRequired false. // isDisplayNetworkNameRequired false.
if (iccSpn.spnDisplayCondition & 0x02) { iccInfo.isDisplayNetworkNameRequired = false;
iccInfo.isDisplayNetworkNameRequired = false; iccInfo.isDisplaySpnRequired = (displayCondition & 0x02) == 0;
iccInfo.isDisplaySpnRequired = false;
} else {
iccInfo.isDisplayNetworkNameRequired = false;
iccInfo.isDisplaySpnRequired = true;
}
} }
} }
@ -12069,9 +12057,7 @@ let RuimRecordHelper = {
debug("CDMA SPN: " + RIL.iccInfo.spn + debug("CDMA SPN: " + RIL.iccInfo.spn +
", Display condition: " + displayCondition); ", Display condition: " + displayCondition);
} }
RIL.iccInfoPrivate.SPN = { RIL.iccInfoPrivate.spnDisplayCondition = displayCondition;
spnDisplayCondition: displayCondition
};
Buf.seekIncoming((octetLen - readLen) * PDU_HEX_OCTET_SIZE); Buf.seekIncoming((octetLen - readLen) * PDU_HEX_OCTET_SIZE);
Buf.readStringDelimiter(strLen); Buf.readStringDelimiter(strLen);
} }

4
dom/system/gonk/tests/test_ril_worker_icc.js
View File

@ -975,9 +975,7 @@ add_test(function test_spn_display_condition() {
expectedIsDisplayNetworkNameRequired, expectedIsDisplayNetworkNameRequired,
expectedIsDisplaySPNRequired, expectedIsDisplaySPNRequired,
callback) { callback) {
RIL.iccInfoPrivate.SPN = { RIL.iccInfoPrivate.spnDisplayCondition = iccDisplayCondition;
spnDisplayCondition: iccDisplayCondition
};
RIL.iccInfo = { RIL.iccInfo = {
mcc: iccMcc, mcc: iccMcc,
mnc: iccMnc mnc: iccMnc

18
dom/system/gonk/tests/test_ril_worker_ruim.js
View File

@ -143,7 +143,7 @@ add_test(function test_read_cdmaspn() {
worker.RuimRecordHelper.readSPN(); worker.RuimRecordHelper.readSPN();
do_check_eq(worker.RIL.iccInfo.spn, expectedSpn); do_check_eq(worker.RIL.iccInfo.spn, expectedSpn);
do_check_eq(worker.RIL.iccInfoPrivate.SPN.spnDisplayCondition, do_check_eq(worker.RIL.iccInfoPrivate.spnDisplayCondition,
expectedDisplayCondition); expectedDisplayCondition);
} }
@ -156,7 +156,7 @@ add_test(function test_read_cdmaspn() {
String.fromCharCode(0x592a) + String.fromCharCode(0x592a) +
String.fromCharCode(0x96fb) + String.fromCharCode(0x96fb) +
String.fromCharCode(0x4fe1), String.fromCharCode(0x4fe1),
true); 0x1);
// Test when there's no tailing 0xff in spn string. // Test when there's no tailing 0xff in spn string.
testReadSpn([0x01, 0x04, 0x06, 0x4e, 0x9e, 0x59, 0x2a, 0x96, testReadSpn([0x01, 0x04, 0x06, 0x4e, 0x9e, 0x59, 0x2a, 0x96,
@ -165,7 +165,7 @@ add_test(function test_read_cdmaspn() {
String.fromCharCode(0x592a) + String.fromCharCode(0x592a) +
String.fromCharCode(0x96fb) + String.fromCharCode(0x96fb) +
String.fromCharCode(0x4fe1), String.fromCharCode(0x4fe1),
true); 0x1);
run_next_test(); run_next_test();
}); });
@ -199,9 +199,7 @@ add_test(function test_cdma_spn_display_condition() {
currentSystemId, currentNetworkId, currentSystemId, currentNetworkId,
expectUpdateDisplayCondition, expectUpdateDisplayCondition,
expectIsDisplaySPNRequired) { expectIsDisplaySPNRequired) {
RIL.iccInfoPrivate.SPN = { RIL.iccInfoPrivate.spnDisplayCondition = ruimDisplayCondition;
spnDisplayCondition: ruimDisplayCondition
};
RIL.cdmaHome = { RIL.cdmaHome = {
systemId: homeSystemIds, systemId: homeSystemIds,
networkId: homeNetworkIds networkId: homeNetworkIds
@ -217,16 +215,16 @@ add_test(function test_cdma_spn_display_condition() {
}; };
// SPN is not required when ruimDisplayCondition is false. // SPN is not required when ruimDisplayCondition is false.
testDisplayCondition(false, [123], [345], 123, 345, true, false); testDisplayCondition(0x0, [123], [345], 123, 345, true, false);
// System id and network id are all match. // System id and network id are all match.
testDisplayCondition(true, [123], [345], 123, 345, true, true); testDisplayCondition(0x1, [123], [345], 123, 345, true, true);
// Network is 65535, we should only need to match system id. // Network is 65535, we should only need to match system id.
testDisplayCondition(true, [123], [65535], 123, 345, false, true); testDisplayCondition(0x1, [123], [65535], 123, 345, false, true);
// Not match. // Not match.
testDisplayCondition(true, [123], [456], 123, 345, true, false); testDisplayCondition(0x1, [123], [456], 123, 345, true, false);
run_next_test(); run_next_test();
}); });