Merge pull request #28703 from weilonge/seanlee/STK/v2.1s/Bug1117663

Bug 1117663 - TR 0x04 should be sent if no icon can be shown. r=frsela
mozilla-b2g · Mar 9, 2015 · 485b69e · 485b69e
2 parents 921b7d2 + b876001
commit 485b69e
Showing 1 changed file with 18 additions and 6 deletions.
diff --git a/apps/system/js/icc_worker.js b/apps/system/js/icc_worker.js
@@ -251,9 +251,15 @@ var icc_worker = {
     }
 
     if (options.responseNeeded) {
-      icc.responseSTKCommand(message, {
-        resultCode: icc._iccManager.STK_RESULT_OK
-      });
+      if (options.iconSelfExplanatory || options.icons) {
+        icc.responseSTKCommand(message, {
+          resultCode: icc._iccManager.STK_RESULT_PRFRMD_ICON_NOT_DISPLAYED
+        });
+      } else {
+        icc.responseSTKCommand(message, {
+          resultCode: icc._iccManager.STK_RESULT_OK
+        });
+      }
       icc.confirm(message, options.text, timeout, null);
     } else {
       icc.confirm(message, options.text, timeout,
@@ -270,9 +276,15 @@ var icc_worker = {
             });
           } else {
             DUMP('Alert closed');
-            icc.responseSTKCommand(message, {
-              resultCode: icc._iccManager.STK_RESULT_OK
-            });
+            if (options.iconSelfExplanatory || options.icons) {
+              icc.responseSTKCommand(message, {
+                resultCode: icc._iccManager.STK_RESULT_PRFRMD_ICON_NOT_DISPLAYED
+              });
+            } else {
+              icc.responseSTKCommand(message, {
+                resultCode: icc._iccManager.STK_RESULT_OK
+              });
+            }
           }
         });
     }