819834 - B2G STK: the options should be null if the typeOfCommand is STK_CMD_POLL_OFF or STK_CMD_REFRESH.

Status: RESOLVED FIXED

(Firefox OS Graveyard :: General, defect)

Description

[Edgar Chen [:edgar]]

The options should be null if the typeOfCommand is STK_CMD_POLL_OFF or STK_CMD_REFRESH.
(See MozStkCommand in dom/icc/interface/SimToolKit.idl)

Comment 1

[Edgar Chen [:edgar]]

Attachment: Part 1: The options should be null, v1

1). The field, 'options', exported to DOM should be null when processing 'STK_CMD_POLL_OFF' or 'STK_CMD_REFRESH'.
2). ril_worker will handle 'STK_CMD_MORE_TIME', no need to propagate event to DOM.
3). The tag ,'COMPREHENSIONTLV_FILE_LIST', seems wrong, correct it.

Comment 2

[Edgar Chen [:edgar]]

Attachment: Part 2: Marionette tests, v1

Marionette tests for 'STK_CMD_POLL_OFF' and 'STK_CMD_REFRESH'

Comment 3

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

Comment on attachment 690703 [details] [diff] [review]
Part 1: The options should be null, v1

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

::: dom/system/gonk/ril_worker.js
@@ +5030,5 @@
> +      return;
> +    }
> +
> +    cmdDetails.options = StkCommandParamsFactory.createParam(cmdDetails, ctlvs);
> +    cmdDetails.rilMessageType = "stkcommand";

swap these two lines,
so we know we are about to send 'stkcommand' and its data.

@@ +7925,5 @@
>      switch (refreshType) {
>        case STK_REFRESH_FILE_CHANGE:
>        case STK_REFRESH_NAA_INIT_AND_FILE_CHANGE:
>          let ctlv = StkProactiveCmdHelper.searchForTag(
> +          COMPREHENSIONTLV_TAG_FILE_LIST, ctlvs);

Good catch!

Comment 4

[Edgar Chen [:edgar]]

Attachment: Part 1: The options should be null, v1.1, r=allstars.chh

Address review comment #3

Comment 5

[Edgar Chen [:edgar]]

try server: https://tbpl.mozilla.org/?tree=Try&rev=4f90381c0867

Comment 6

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

I got conflict when trying to push part 2.
Please rebase again.

Comment 7

[Edgar Chen [:edgar]]

Attachment: Part 2: Marionette tests, v2, r=allstars.chh

rebase only

Comment 8

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

https://hg.mozilla.org/integration/mozilla-inbound/rev/eddc239db462
https://hg.mozilla.org/integration/mozilla-inbound/rev/caf2b8ec76f9

Comment 9

[Ed Morley [:emorley]]

https://hg.mozilla.org/mozilla-central/rev/eddc239db462
https://hg.mozilla.org/mozilla-central/rev/caf2b8ec76f9