Bug 786831 - Part 1: Update IDL. r=philikon.
authorYoshi Huang <allstars.chh@mozilla.com>
Wed, 29 Aug 2012 18:36:17 -0300
changeset 103929 98b94d18373ee4fed7fc9895315e2a4a031193a5
parent 103928 f6e4e6857c0c68460eb352ecbb692483f74e0fb6
child 103930 7ea41d5679c4293b7e7056703f2b89ff86e440c3
push id14254
push useryhuang@mozilla.com
push dateThu, 30 Aug 2012 21:27:22 +0000
treeherdermozilla-inbound@604c5f59c5e0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersphilikon
bugs786831
milestone18.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 786831 - Part 1: Update IDL. r=philikon.
dom/icc/interfaces/SimToolKit.idl
dom/icc/interfaces/nsIDOMIccManager.idl
dom/network/interfaces/nsIMobileConnectionProvider.idl
--- a/dom/icc/interfaces/SimToolKit.idl
+++ b/dom/icc/interfaces/SimToolKit.idl
@@ -302,37 +302,16 @@ interface nsIDOMMozStkCommandEvent : nsI
    */
   [implicit_jscontext]
   readonly attribute jsval command;
 };
 
 dictionary MozStkResponse
 {
   /**
-   * commandNumber from MozStkCommand.
-   *
-   * @see MozStkCommand.commandNumber
-   */
-  unsigned short commandNumber;
-
-  /**
-   * One of MozStkCommand.typeOfCommand
-   *
-   * @see MozStkCommand.typeOfCommand
-   */
-  unsigned short typeOfCommand;
-
-  /**
-   * Qualifiers specific to the command.
-   *
-   * @see MozStkCommand.commandQualifier
-   */
-  unsigned short commandQualifier;
-
-  /**
    * One of RESULT_*
    */
   unsigned short resultCode;
 
   /**
    * The identifier of the item selected by user.
    *
    * @see MozStkItem.identifier
--- a/dom/icc/interfaces/nsIDOMIccManager.idl
+++ b/dom/icc/interfaces/nsIDOMIccManager.idl
@@ -139,21 +139,23 @@ interface nsIDOMMozIccManager : nsIDOMEv
 
   /** Bearer Independent Protocol error */
   const unsigned short STK_RESULT_BIP_ERROR                         = 0x3a;
 
   /**
    * Send the response back to ICC after an attempt to execute STK Proactive
    * Command.
    *
+   * @param command
+   *        Command received from ICC. See MozStkCommand.
    * @param response
    *        The response that will be sent to ICC.
    * @see MozStkResponse for the detail of response.
    */
-  void sendStkResponse(in jsval response);
+  void sendStkResponse(in jsval command, in jsval response);
 
   /**
    * Send the "Menu Selection" Envelope command to ICC for menu selection.
    *
    * @param itemIdentifier
    *        The identifier of the item selected by user.
    * @param helpRequested
    *        true if user requests to provide help information, false otherwise.
--- a/dom/network/interfaces/nsIMobileConnectionProvider.idl
+++ b/dom/network/interfaces/nsIMobileConnectionProvider.idl
@@ -28,13 +28,14 @@ interface nsIMobileConnectionProvider : 
   nsIDOMDOMRequest getCardLock(in nsIDOMWindow window, in DOMString lockType);
   nsIDOMDOMRequest unlockCardLock(in nsIDOMWindow window, in jsval info);
   nsIDOMDOMRequest setCardLock(in nsIDOMWindow window, in jsval info);
 
   nsIDOMDOMRequest sendUSSD(in nsIDOMWindow window, in DOMString ussd);
   nsIDOMDOMRequest cancelUSSD(in nsIDOMWindow window);
 
   void sendStkResponse(in nsIDOMWindow window,
+                       in jsval        command,
                        in jsval        response);
   void sendStkMenuSelection(in nsIDOMWindow   window,
                             in unsigned short itemIdentifier,
                             in boolean        helpRequested);
 };