From 221487c0da02c986d46a2db0c3c84990aa4d3e58 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Thu, 24 Jan 2013 07:48:07 -0500
Subject: [PATCH] Backed out changesets ed1ef43ce9af, 3d2b3f7eac93, and
 8fc6d7d32482 (bug 827831) for Marionette failures.

---
 dom/icc/interfaces/SimToolKit.idl                     |  8 --------
 .../tests/marionette/test_stk_proactive_command.js    | 11 -----------
 dom/system/gonk/ril_worker.js                         |  7 -------
 3 files changed, 26 deletions(-)

diff --git a/dom/icc/interfaces/SimToolKit.idl b/dom/icc/interfaces/SimToolKit.idl
index 30ad131095ec..735b2db33a27 100644
--- a/dom/icc/interfaces/SimToolKit.idl
+++ b/dom/icc/interfaces/SimToolKit.idl
@@ -118,14 +118,6 @@ dictionary MozStkInput
    */
   DOMString text;
 
-  /**
-   * The length of time for which the ME shall display the dialog. This field
-   * is used only for GET INKEY.
-   *
-   * @see TS 11.14, clause 11.8, duration, GET INKEY T.C 27.22.4.2.8.4.2
-   */
-  jsval duration;
-
   /**
    * Minimum length of response.
    */
diff --git a/dom/icc/tests/marionette/test_stk_proactive_command.js b/dom/icc/tests/marionette/test_stk_proactive_command.js
index 3ef709ee9e41..1edddaf6081d 100644
--- a/dom/icc/tests/marionette/test_stk_proactive_command.js
+++ b/dom/icc/tests/marionette/test_stk_proactive_command.js
@@ -130,15 +130,6 @@ function testTimerManagementGetCurrentValue(cmd) {
   runNextTest();
 }
 
-function testGetInKeyVariableTimeout(cmd) {
-  log("STK CMD " + JSON.stringify(cmd));
-  is(cmd.typeOfCommand, icc.STK_CMD_GET_INKEY);
-  is(cmd.duration.timeUnit, 0x01);
-  is(cmd.duration.timeInterval, 0x0A);
-
-  runNextTest();
-}
-
 function testSetupCall(cmd) {
   log("STK CMD " + JSON.stringify(cmd));
   is(cmd.typeOfCommand, icc.STK_CMD_SET_UP_CALL);
@@ -178,8 +169,6 @@ let tests = [
    func: testTimerManagementGetCurrentValue},
   {command: "d029810301100482028182050a446973636f6e6e6563748609811032042143651c2c05074d657373616765",
    func: testSetupCall},
-  {command: "D0198103012200820281828D0A04456E74657220222B228402010A",
-   func: testGetInKeyVariableTimeout},
 ];
 
 let pendingEmulatorCmdCount = 0;
diff --git a/dom/system/gonk/ril_worker.js b/dom/system/gonk/ril_worker.js
index 7953d07a5516..c0d7929fd86a 100644
--- a/dom/system/gonk/ril_worker.js
+++ b/dom/system/gonk/ril_worker.js
@@ -7402,13 +7402,6 @@ let StkCommandParamsFactory = {
     }
     input.text = ctlv.value.textString;
 
-    // duration
-    ctlv = StkProactiveCmdHelper.searchForTag(
-        COMPREHENSIONTLV_TAG_DURATION, ctlvs);
-    if (ctlv) {
-      input.duration = ctlv.value;
-    }
-
     input.minLength = 1;
     input.maxLength = 1;