Merge pull request #8934 from ian-liu/ril/Bug845629_change_mnc_mcc_ty…

…pe_from_integer_to_string Bug 845629 - [Gaia] change mcc/mnc type from integer to string. r=kaze
mozilla-b2g · Apr 18, 2013 · 96a236d · 96a236d
2 parents f895401 + e48cdba
commit 96a236d
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 21 deletions.
diff --git a/apps/browser/js/browser.js b/apps/browser/js/browser.js
@@ -252,7 +252,7 @@ var Browser = {
     console.log('Populating default data.');
 
     var DEFAULT_BOOKMARK = '000000';
-    var iccSettings = { mcc: -1, mnc: -1 };
+    var iccSettings = { mcc: '-1', mnc: '-1' };
 
     // Read the mcc/mnc settings, then trigger callback.
     // pattern from system/js/operator_variant/operator_variant.js
@@ -263,10 +263,10 @@ var Browser = {
 
       var mccRequest = transaction.get(mccKey);
       mccRequest.onsuccess = function() {
-        iccSettings.mcc = parseInt(mccRequest.result[mccKey], 10) || 0;
+        iccSettings.mcc = mccRequest.result[mccKey] || '0';
         var mncRequest = transaction.get(mncKey);
         mncRequest.onsuccess = function() {
-          iccSettings.mnc = parseInt(mncRequest.result[mncKey], 10) || 0;
+          iccSettings.mnc = mncRequest.result[mncKey] || '0';
           callback(data);
         };
       };
@@ -282,10 +282,10 @@ var Browser = {
     }
 
     // pad leading zeros
-    function zfill(num, len) {
-      var n = num + '';
-      while (n.length < len) n = '0' + n;
-      return n;
+    function zfill(code, len) {
+      var c = code;
+      while (c.length < len) c = '0' + c;
+      return c;
     }
 
     /* Match best bookmark setting by

diff --git a/apps/settings/js/utils.js b/apps/settings/js/utils.js
@@ -337,8 +337,8 @@ var getMobileConnection = function() {
     return navigator.mozMobileConnection;
 
   var initialized = false;
-  var fakeICCInfo = { shortName: 'Fake Free-Mobile', mcc: 208, mnc: 15 };
-  var fakeNetwork = { shortName: 'Fake Orange F', mcc: 208, mnc: 1 };
+  var fakeICCInfo = { shortName: 'Fake Free-Mobile', mcc: '208', mnc: '15' };
+  var fakeNetwork = { shortName: 'Fake Orange F', mcc: '208', mnc: '1' };
   var fakeVoice = {
     state: 'notSearching',
     roaming: true,

diff --git a/apps/system/js/operator_variant/operator_variant.js b/apps/system/js/operator_variant/operator_variant.js
@@ -12,7 +12,7 @@
   if (!settings)
     return;
 
-  var iccSettings = { mcc: -1, mnc: -1 };
+  var iccSettings = { mcc: '-1', mnc: '-1' };
 
   // Read the mcc/mnc settings, then trigger callback.
   function getICCSettings(callback) {
@@ -22,10 +22,10 @@
 
     var mccRequest = transaction.get(mccKey);
     mccRequest.onsuccess = function() {
-      iccSettings.mcc = parseInt(mccRequest.result[mccKey], 10) || 0;
+      iccSettings.mcc = mccRequest.result[mccKey] || '0';
       var mncRequest = transaction.get(mncKey);
       mncRequest.onsuccess = function() {
-        iccSettings.mnc = parseInt(mncRequest.result[mncKey], 10) || 0;
+        iccSettings.mnc = mncRequest.result[mncKey] || '0';
         callback();
       };
     };
@@ -51,9 +51,9 @@
       return;
 
     // XXX sometimes we get 0/0 for mcc/mnc, even when cardState === 'ready'...
-    var mcc = parseInt(mobileConnection.iccInfo.mcc, 10) || 0;
-    var mnc = parseInt(mobileConnection.iccInfo.mnc, 10) || 0;
-    if (!mcc || !mnc)
+    var mcc = mobileConnection.iccInfo.mcc || '0';
+    var mnc = mobileConnection.iccInfo.mnc || '0';
+    if ((mcc === '0') || (mnc === '0'))
       return;
 
     // same SIM card => do nothing

diff --git a/apps/system/test/unit/mobile_operator_test.js b/apps/system/test/unit/mobile_operator_test.js
@@ -78,7 +78,7 @@ suite('shared/MobileOperator', function() {
     });
     test('Connection with unknown mnc', function() {
       MockMobileConnection.voice.network.mcc = BRAZIL_MCC;
-      MockMobileConnection.voice.network.mnc = 42;
+      MockMobileConnection.voice.network.mnc = '42';
       var infos = MobileOperator.userFacingInfo(MockMobileConnection);
       assert.equal(infos.operator, 'Fake short');
       assert.equal(infos.carrier, '72442');

diff --git a/apps/system/test/unit/statusbar_test.js b/apps/system/test/unit/statusbar_test.js
@@ -401,7 +401,7 @@ suite('system/Statusbar', function() {
         network: {
           shortName: 'Fake short',
           longName: 'Fake long',
-          mnc: 10 // VIVO
+          mnc: '10' // VIVO
         },
         cell: {
           gsmLocationAreaCode: 71 // BA

diff --git a/build/settings.py b/build/settings.py
@@ -69,8 +69,8 @@
  "lockscreen.unlock-sound.enabled": False,
  "mail.sent-sound.enabled": True,
  "message.sent-sound.enabled": True,
- "operatorvariant.mcc": 0,
- "operatorvariant.mnc": 0,
+ "operatorvariant.mcc": "0",
+ "operatorvariant.mnc": "0",
  "ril.iccInfo.mbdn":"",
  "ril.sms.strict7BitEncoding.enabled": False,
  "ril.cellbroadcast.searchlist": "",

diff --git a/shared/resources/apn/query.js b/shared/resources/apn/query.js
@@ -262,8 +262,8 @@ document.addEventListener('DOMContentLoaded', function onload() {
 
   function update() {
     var selection = document.getElementById('selection');
-    var mcc = parseInt(document.querySelector('input[name=mcc]').value, 10);
-    var mnc = parseInt(document.querySelector('input[name=mnc]').value, 10);
+    var mcc = document.querySelector('input[name=mcc]');
+    var mnc = document.querySelector('input[name=mnc]');
     var res = gAPN[mcc] ? (gAPN[mcc][mnc] || []) : [];
     selection.textContent = JSON.stringify(res, true, 2);