Merge pull request #19066 from tdz/bug-1007657

Bug 1007657 - Support string constants in MozIccManager. r=timdream
mozilla-b2g · May 13, 2014 · e6094f3 · e6094f3
2 parents b4525bb + 63bb4c3
commit e6094f3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/apps/system/js/icc.js b/apps/system/js/icc.js
@@ -137,7 +137,13 @@ var icc = {
       return DUMP('FTU is running, delaying STK...');
     }
 
-    var cmdId = '0x' + message.command.typeOfCommand.toString(16);
+    /* TODO: cleanup branching after bug 819831 landed */
+    var cmdId;
+    if (typeof message.command.typeOfCommand === 'string') {
+      cmdId = message.command.typeOfCommand;
+    } else {
+      cmdId = '0x' + message.command.typeOfCommand.toString(16);
+    }
     if (icc_worker[cmdId]) {
       return icc_worker[cmdId](message);
     }

diff --git a/apps/system/test/unit/icc_worker_test.js b/apps/system/test/unit/icc_worker_test.js
@@ -101,6 +101,10 @@ suite('STK (icc_worker) >', function() {
 
   function launchStkCommand(cmd) {
     function stkCmd(CMD) {
+      /* TODO: cleanup this function after bug 819831 landed */
+      if (typeof CMD === 'string') {
+        return CMD;
+      }
       return '0x' + CMD.toString(16);
     }
     icc_worker[stkCmd(cmd.command.typeOfCommand)](cmd);