944725 - B2G RIL: const the error message returned by icc.read/updateContact.

Status: RESOLVED FIXED

(Firefox OS Graveyard :: RIL, defect)

Description

[Yoshi Cheng-Hao Huang [:allstars.chh][:allstarschh][:yoshi]]

We should make the error message returned icc.read/updateContact more consistent.
Maybe const them into ril_const.js.

Comment 1

[Yoshi Cheng-Hao Huang [:allstars.chh][:allstarschh][:yoshi]]

Attachment: Part 1: unify errorMsg in icc.read/updateContacts.

Comment 2

[Yoshi Cheng-Hao Huang [:allstars.chh][:allstarschh][:yoshi]]

Attachment: Part 2: add xpcshell-tests for tesring returned errorMsg.

Comment 3

[Yoshi Cheng-Hao Huang [:allstars.chh][:allstarschh][:yoshi]]

Attachment: Part 2: add xpcshell-tests for tesring returned errorMsg. v2

Add tests for PIN2 and ICC IO Error.
And update the marionette test as well.

Comment 4

[Vicamo Yang [:vicamo][:vyang]]

Comment on attachment 8341588 [details] [diff] [review]
Part 1: unify errorMsg in icc.read/updateContacts.

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

::: dom/system/gonk/ril_worker.js
@@ +11166,3 @@
>      // See GSM11.11, TS 51.011 clause 9.4, and ISO 7816-4 for the error
>      // description.
>      let errorMsg = "ICC I/O Error code " +

nit: brace all errorMsg related lines with DEBUG.

Comment 5

[Yoshi Cheng-Hao Huang [:allstars.chh][:allstarschh][:yoshi]]

Attachment: Part 1: unify errorMsg in icc.read/updateContacts. v2.

move errorMsg inside processICCIOError into if (DEBUG)

Comment 6

[Yoshi Cheng-Hao Huang [:allstars.chh][:allstarschh][:yoshi]]

Try
https://tbpl.mozilla.org/?tree=Try&rev=412511c42c67

Comment 7

[Yoshi Cheng-Hao Huang [:allstars.chh][:allstarschh][:yoshi]]

https://hg.mozilla.org/integration/b2g-inbound/rev/deaef09b17c1
https://hg.mozilla.org/integration/b2g-inbound/rev/82345b162c51

Comment 8

[Carsten Book [:Tomcat]]

(In reply to Yoshi Huang[:allstars.chh][:yoshi] from comment #7)
> https://hg.mozilla.org/integration/b2g-inbound/rev/deaef09b17c1
> https://hg.mozilla.org/integration/b2g-inbound/rev/82345b162c51

sorry, had to backout this change since this caused a bustage in marionette-webapi tests like https://tbpl.mozilla.org/php/getParsedLog.php?id=31431202&tree=B2g-Inbound

Comment 9

[Yoshi Cheng-Hao Huang [:allstars.chh][:allstarschh][:yoshi]]

Oh, it seems I push the older patch in Comment 7.

Sorry for the trouble here.

Comment 10

[Yoshi Cheng-Hao Huang [:allstars.chh][:allstarschh][:yoshi]]

Comment on attachment 8341640 [details] [diff] [review]
Part 2: add xpcshell-tests for tesring returned errorMsg. v2

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

::: dom/system/gonk/tests/test_ril_worker_icc.js
@@ +1959,5 @@
> +  USIM_PBR_FIELDS.push("pbc");
> +  do_test({contactType: "adn", contact: {contactId: ICCID + "1"}},
> +          CONTACT_ERR_FIELD_NOT_SUPPORTED);
> +
> +  // Error 7, EF_PBR doesn't exist.

Typo here, should be Error 8.

Comment 11

[Yoshi Cheng-Hao Huang [:allstars.chh][:allstarschh][:yoshi]]

Attachment: Part 2: add xpcshell-tests for tesring returned errorMsg. v3

Fixed typo.

Comment 12

[Yoshi Cheng-Hao Huang [:allstars.chh][:allstarschh][:yoshi]]

Attachment: Part 1: unify errorMsg in icc.read/updateContacts. v3.

rebase

Comment 13

[Yoshi Cheng-Hao Huang [:allstars.chh][:allstarschh][:yoshi]]

https://hg.mozilla.org/integration/b2g-inbound/rev/aa1af723d28d
https://hg.mozilla.org/integration/b2g-inbound/rev/1d8604c150e7

with try 

https://tbpl.mozilla.org/?tree=Try&rev=9516f808944e

Comment 14

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/aa1af723d28d
https://hg.mozilla.org/mozilla-central/rev/1d8604c150e7