Merge pull request #23956 from EdgarChen/bug_1065401/stk_get_inkey

Bug 1065401 - [Gaia][STK] Put the result in isYesNo for the "Yes or No" GET_INKEY request. r=frsela
mozilla-b2g · Sep 16, 2014 · 3ee96e9 · 3ee96e9
2 parents 3465944 + b8e7475
commit 3ee96e9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/apps/system/js/icc.js b/apps/system/js/icc.js
@@ -510,7 +510,7 @@ var icc = {
     // Help
     this.icc_input_btn_help.disabled = !options.isHelpAvailable;
 
-    if (!options.isYesNoRequired && !options.isYesNoRequested) {
+    if (!options.isYesNoRequested) {
       this.icc_input.classList.remove('yesnomode');
 
       // Workaround. See bug #818270. Followup: #895314
@@ -554,12 +554,12 @@ var icc = {
       this.icc_input_btn_yes.onclick = function(event) {
         clearInputTimeout();
         self.hideViews();
-        callback(true, 1);
+        callback(true, true);
       };
       this.icc_input_btn_no.onclick = function(event) {
         clearInputTimeout();
         self.hideViews();
-        callback(true, 0);
+        callback(true, false);
       };
     }
 

diff --git a/apps/system/js/icc_worker.js b/apps/system/js/icc_worker.js
@@ -319,10 +319,17 @@ var icc_worker = {
           });
         } else {
           DUMP('STK_CMD_GET_INPUT: Response = ', value);
-          icc.responseSTKCommand(message, {
-            resultCode: icc._iccManager.STK_RESULT_OK,
-            input: value
-          });
+          if (typeof value === 'boolean') {
+            icc.responseSTKCommand(message, {
+              resultCode: icc._iccManager.STK_RESULT_OK,
+              isYesNo: value
+            });
+          } else {
+            icc.responseSTKCommand(message, {
+              resultCode: icc._iccManager.STK_RESULT_OK,
+              input: value
+            });
+          }
         }
       });
   },