Bug 946165 - Send REQUEST_REPORT_STK_SERVICE_IS_RUNNING after iccid is ready. r=allstars.chh
authorEdgar Chen <echen@mozilla.com>
Fri, 06 Dec 2013 13:42:36 +0800
changeset 159194 fe1ac343ac94df65889210711e8335c0bc6f3f51
parent 159193 bbbf469d9ba0bad69689c507d5116aee155cfd4f
child 159195 57e0c908312e1b34566610b4763008f6588c02fd
push idunknown
push userunknown
push dateunknown
reviewersallstars.chh
bugs946165
milestone28.0a1
Bug 946165 - Send REQUEST_REPORT_STK_SERVICE_IS_RUNNING after iccid is ready. r=allstars.chh
dom/system/gonk/ril_worker.js
--- a/dom/system/gonk/ril_worker.js
+++ b/dom/system/gonk/ril_worker.js
@@ -3009,17 +3009,16 @@ let RIL = {
       // Other types of ICC we can send Terminal_Profile immediately.
       if (this.appType == CARD_APPTYPE_SIM) {
         SimRecordHelper.readSimPhase();
       } else if (RILQUIRKS_SEND_STK_PROFILE_DOWNLOAD) {
         this.sendStkTerminalProfile(STK_SUPPORTED_TERMINAL_PROFILE);
       }
 
       ICCRecordHelper.fetchICCRecords();
-      this.reportStkServiceIsRunning();
     }
 
     this.cardState = newCardState;
     this.sendChromeMessage({rilMessageType: "cardstatechange",
                             cardState: this.cardState});
   },
 
    /**
@@ -11220,16 +11219,17 @@ let ICCRecordHelper = {
       let strLen = Buf.readInt32();
       let octetLen = strLen / 2;
       RIL.iccInfo.iccid = GsmPDUHelper.readSwappedNibbleBcdString(octetLen);
       Buf.readStringDelimiter(strLen);
 
       if (DEBUG) debug("ICCID: " + RIL.iccInfo.iccid);
       if (RIL.iccInfo.iccid) {
         ICCUtilsHelper.handleICCInfoChange();
+        RIL.reportStkServiceIsRunning();
       }
     }
 
     ICCIOHelper.loadTransparentEF({fileId: ICC_EF_ICCID,
                                    callback: callback.bind(this)});
   },
 
   /**