Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-14 13:55:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1091429 - B2G RIL: Correct UCS2 handling for EFPNN. r=Edgar.

Browse Source
This commit is contained in:
Shawn Ku 2014-10-31 10:18:28 +08:00
parent 8f45ec9029
commit f9d9d61b6e
2 changed files with 64 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8863,7 +8863,7 @@ GsmPDUHelperObject.prototype = {
break;
case 1:
// UCS2 encoded.
resultString = this.readUCS2String(len - 1);
resultString = this.context.ICCPDUHelper.readAlphaIdentifier(len - 1);
break;
default:
// Not an available text coding.

63
dom/system/gonk/tests/test_ril_worker_icc_SimRecordHelper.js
View File

@ -1503,3 +1503,66 @@ add_test(function test_read_mbdn_recovered_from_cphs_mbn() {
run_next_test();
});
/**
* Verify reading EF_PNN with different coding scheme.
*/
add_test(function test_pnn_with_different_coding_scheme() {
let worker = newUint8Worker();
let context = worker.ContextPool._contexts[0];
let record = context.SimRecordHelper;
let pduHelper = context.GsmPDUHelper;
let ril = context.RIL;
let buf = context.Buf;
let io = context.ICCIOHelper;
let test_data = [{
// Cell Broadcast data coding scheme - "Test1"
pnn: [0x43, 0x06, 0x85, 0xD4, 0xF2, 0x9C, 0x1E, 0x03],
expectedResult: "Test1"
},{
// UCS2 with 0x80 - "Test1"
pnn: [0x43, 0x0C, 0x90, 0x80, 0x00, 0x54, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00, 0x31],
expectedResult: "Test1"
},{
// UCS2 with 0x81 - "Mozilla\u694a"
pnn: [0x43, 0x0E, 0x90, 0x81, 0x08, 0xd2, 0x4d, 0x6f, 0x7a, 0x69, 0x6c, 0x6c, 0x61, 0xca, 0xff, 0xff],
expectedResult: "Mozilla\u694a"
},{
// UCS2 with 0x82 - "Mozilla\u694a"
pnn: [0x43, 0x0F, 0x90, 0x82, 0x08, 0x69, 0x00, 0x4d, 0x6f, 0x7a, 0x69, 0x6c, 0x6c, 0x61, 0xca, 0xff, 0xff],
expectedResult: "Mozilla\u694a"
}];
function do_test_pnn(pnn, expectedResult) {
io.loadLinearFixedEF = function fakeLoadLinearFixedEF(options) {
// Write data size.
buf.writeInt32(pnn.length * 2);
// Write data.
for (let i = 0; i < pnn.length; i++) {
pduHelper.writeHexOctet(pnn[i]);
}
// Write string delimiter.
buf.writeStringDelimiter(pnn.length * 2);
if (options.callback) {
options.callback(options);
}
};
record.readPNN();
do_check_eq(ril.iccInfoPrivate.PNN[0].fullName, expectedResult);
// Reset PNN info for next test
ril.iccInfoPrivate.PNN = null;
}
ril.appType = CARD_APPTYPE_SIM;
for (let i = 0; i < test_data.length; i++) {
do_test_pnn(test_data[i].pnn, test_data[i].expectedResult);
}
run_next_test();
});