Bug 944635 - B2G RIL: Exception in updateDisplayCondition() ... "TypeError: RIL.operator is null". r=HsinYi, a=1.4+
authorShawn Ku <sku@mozilla.com>
Mon, 23 Jun 2014 11:47:33 +0800
changeset 208809 d5fb5bf53526e0b50facb2bf517b5cbee601731e
parent 208808 6dfc80955ae17834bd7118d54b3a17e80979292d
child 208810 c6da1999f77a0bba5acb102821c2d59f426ac507
push id494
push userraliiev@mozilla.com
push dateMon, 25 Aug 2014 18:42:16 +0000
treeherdermozilla-release@a3cc3e46b571 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersHsinYi, 1
bugs944635
milestone32.0a2
Bug 944635 - B2G RIL: Exception in updateDisplayCondition() ... "TypeError: RIL.operator is null". r=HsinYi, a=1.4+
dom/system/gonk/ril_worker.js
--- a/dom/system/gonk/ril_worker.js
+++ b/dom/system/gonk/ril_worker.js
@@ -13902,18 +13902,18 @@ ICCUtilsHelperObject.prototype = {
               break;
             }
           }
           iccInfo.isDisplaySpnRequired = inHomeArea;
         }
       }
     } else {
       // GSM family display rule.
-      let operatorMnc = RIL.operator.mnc;
-      let operatorMcc = RIL.operator.mcc;
+      let operatorMnc = RIL.operator ? RIL.operator.mnc : -1;
+      let operatorMcc = RIL.operator ? RIL.operator.mcc : -1;
 
       // First detect if we are on HPLMN or one of the PLMN
       // specified by the SIM card.
       let isOnMatchingPlmn = false;
 
       // If the current network is the one defined as mcc/mnc
       // in SIM card, it's okay.
       if (iccInfo.mcc == operatorMcc && iccInfo.mnc == operatorMnc) {