1091429 - B2G RIL: Correct UCS2 handling for EFPNN.

Status: RESOLVED FIXED

(Firefox OS Graveyard :: RIL, defect)

Description

[shawn ku [:sku]]

According to 3GPP TS 11.11 Annex B, we should follow ISO/IEC 10646 for UCS2 string handling.

Currently, we do not parse first octet correctly (see [1]), this will cause PNN with UCS2 format can not be parsed properly.


[1] - http://dxr.mozilla.org/mozilla-central/source/dom/system/gonk/ril_worker.js?from=ril_worker.js&case=true#8855

Comment 1

[shawn ku [:sku]]

Attachment: Bug 1091429 - B2G RIL: Correct UCS2 handling for EFPNN.

Comment 3

[Edgar Chen [:edgar]]

Comment on attachment 8514063 [details] [diff] [review]
Bug 1091429 - B2G RIL: Correct UCS2 handling for EFPNN.

Review of attachment 8514063 [details] [diff] [review]:
-----------------------------------------------------------------

r=me with below comments addressed, thank you.

::: dom/system/gonk/tests/test_ril_worker_icc_SimRecordHelper.js
@@ +609,5 @@
> +add_test(function test_pnn_with_different_coding_scheme() {
> +  let worker = newUint8Worker();
> +  let context = worker.ContextPool._contexts[0];
> +  let record = context.SimRecordHelper;
> +  let helper = context.GsmPDUHelper;

nit: s/helper/pduHelper/

@@ +622,5 @@
> +              // UCS2 with 0x81 - "Mozilla\u694a"
> +              [0x43, 0x0E, 0x90, 0x81, 0x08, 0xd2, 0x4d, 0x6f, 0x7a, 0x69, 0x6c, 0x6c, 0x61, 0xca, 0xff, 0xff],
> +              // USC2 with 0x82 - "Mozilla\u694a"
> +              [0x43, 0x0F, 0x90, 0x82, 0x08, 0x69, 0x00, 0x4d, 0x6f, 0x7a, 0x69, 0x6c, 0x6c, 0x61, 0xca, 0xff, 0xff]];
> +  let expectedResult = ["Test1", "Test1", "Mozilla\u694a", "Mozilla\u694a"];

Put the raw data and expectedResult together.

let test_data = [{
  pnn: [ ... ],
  expectedResult: "...."
},{
  ....
  ....
}];

@@ +649,5 @@
> +  ril.appType = CARD_APPTYPE_SIM;
> +  for (let i = 0; i < pnn.length; i++) {
> +    do_test_pnn(pnn[i], expectedResult[i]);
> +
> +    do_check_eq(ril.iccInfoPrivate.PNN[0].fullName, expectedResult[i]);

Move the check into do_test_pnn().

@@ +652,5 @@
> +
> +    do_check_eq(ril.iccInfoPrivate.PNN[0].fullName, expectedResult[i]);
> +
> +    // Reset PNN info for next test
> +    ril.iccInfoPrivate.PNN = null;

And this.

Comment 4

[shawn ku [:sku]]

Attachment: [2.0m] Bug 1091429 - B2G RIL: Correct UCS2 handling for EFPNN. r=Edgar.

Comment 5

[shawn ku [:sku]]

try green - https://tbpl.mozilla.org/?tree=Try&rev=bcf81ed09f6c

Comment 6

[shawn ku [:sku]]

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

Comment 7

[Kai-Zhen Li [:seinlin][:kli]]

https://hg.mozilla.org/integration/b2g-inbound/rev/d8c0e3146cb5

Comment 8

[Kai-Zhen Li [:seinlin][:kli]]

http://hg.mozilla.org/releases/mozilla-b2g32_v2_0m/rev/be93043ee58a

Comment 9

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/d8c0e3146cb5