Bug 1056449 - B2G RIL: Correct trigger point for overrideICCNetworkName for OPL/PNN reading. r=Edgar
authorShawn Ku <sku@mozilla.com>
Fri, 22 Aug 2014 10:05:34 +0800
changeset 201162 eef7cc27b5c6909cfe6f99272414dfecb82777ec
parent 201161 dfcfafb1489f3ee7b83edf658dbd88fd54b891d8
child 201163 5f24556f8de051a4cb45d36db6d4783d980d1d13
push id48102
push userkwierso@gmail.com
push dateSat, 23 Aug 2014 00:05:41 +0000
treeherdermozilla-inbound@09ee525ce99d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersEdgar
bugs1056449
milestone34.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1056449 - B2G RIL: Correct trigger point for overrideICCNetworkName for OPL/PNN reading. r=Edgar
dom/system/gonk/ril_worker.js
--- a/dom/system/gonk/ril_worker.js
+++ b/dom/system/gonk/ril_worker.js
@@ -14169,19 +14169,18 @@ SimRecordHelperObject.prototype = {
       }
       Buf.readStringDelimiter(strLen);
 
       let RIL = this.context.RIL;
       if (options.p1 < options.totalRecords) {
         ICCIOHelper.loadNextRecord(options);
       } else {
         RIL.iccInfoPrivate.OPL = opl;
-      }
-
-      RIL.overrideICCNetworkName();
+        RIL.overrideICCNetworkName();
+      }
     }
 
     ICCIOHelper.loadLinearFixedEF({fileId: ICC_EF_OPL,
                                    callback: callback.bind(this)});
   },
 
   /**
    * Read PNN (PLMN Network Name) from (U)SIM.
@@ -14240,19 +14239,18 @@ SimRecordHelperObject.prototype = {
         ICCIOHelper.loadNextRecord(options);
       } else {
         if (DEBUG) {
           for (let i = 0; i < pnn.length; i++) {
             this.context.debug("PNN: [" + i + "]: " + JSON.stringify(pnn[i]));
           }
         }
         RIL.iccInfoPrivate.PNN = pnn;
-      }
-
-      RIL.overrideICCNetworkName();
+        RIL.overrideICCNetworkName();
+      }
     }
 
     let pnn = [];
     ICCIOHelper.loadLinearFixedEF({fileId: ICC_EF_PNN,
                                    callback: callback.bind(this)});
   },
 
   /**