Bug 1013847 - Part 1-2: Don't need to cache iccStatus in RilObject. r=hsinyi
authorEdgar Chen <echen@mozilla.com>
Wed, 20 Aug 2014 16:10:38 +0800
changeset 224075 2214c82b7dffbb1a481cc4bf7abc9f7f1a36a117
parent 224074 df4da4161ac3900727efa0d375b3d181e6589b51
child 224076 2a8d5eec4c383c0228f5bbbc7f02600814a87758
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 17:57:20 +0000
reviewershsinyi
bugs1013847
milestone34.0a1
Bug 1013847 - Part 1-2: Don't need to cache iccStatus in RilObject. r=hsinyi
dom/system/gonk/ril_worker.js
--- a/dom/system/gonk/ril_worker.js
+++ b/dom/system/gonk/ril_worker.js
@@ -440,22 +440,16 @@ RilObject.prototype = {
 
     /**
      * Set when radio is ready but radio tech is unknown. That is, we are
      * waiting for REQUEST_VOICE_RADIO_TECH
      */
     this._waitingRadioTech = false;
 
     /**
-     * ICC status. Keeps a reference of the data response to the
-     * getICCStatus request.
-     */
-    this.iccStatus = null;
-
-    /**
      * Card state
      */
     this.cardState = GECKO_CARDSTATE_UNINITIALIZED;
 
     /**
      * Strings
      */
     this.IMEI = null;
@@ -3448,17 +3442,16 @@ RilObject.prototype = {
     // If |_waitingRadioTech| is true, we should not get app information because
     // the |_isCdma| flag is not ready yet. Otherwise we may use wrong index to
     // get app information, especially for the case that icc card has both cdma
     // and gsm subscription.
     if (this._waitingRadioTech) {
       return;
     }
 
-    this.iccStatus = iccStatus;
     let newCardState;
     let index = this._isCdma ? iccStatus.cdmaSubscriptionAppIndex :
                                iccStatus.gsmUmtsSubscriptionAppIndex;
 
     if (RILQUIRKS_SUBSCRIPTION_CONTROL && index === -1) {
       // Should enable uicc scription if index is not valid.
       if (this.radioState !== GECKO_RADIOSTATE_READY) {
         // Note: setUiccSubscription works abnormally when RADIO is OFF,