Merge pull request #7414 from Rik/roaming-825121

Bug 825121 - [Lockscreen] service provider shown wrongly when roaming, r=timdream, a=blocking-basecamp
mozilla-b2g · Jan 9, 2013 · 8869378 · 8869378
2 parents 2a3b7e8 + 6c1de81
commit 8869378
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/apps/system/test/unit/mobile_operator_test.js b/apps/system/test/unit/mobile_operator_test.js
@@ -52,6 +52,21 @@ suite('shared/MobileOperator', function() {
       assert.isUndefined(infos.carrier);
       assert.isUndefined(infos.region);
     });
+    test('Connection with roaming', function() {
+      MockMobileConnection.voice.roaming = true;
+      var infos = MobileOperator.userFacingInfo(MockMobileConnection);
+      assert.equal(infos.operator, 'Fake short');
+      assert.isUndefined(infos.carrier);
+      assert.isUndefined(infos.region);
+    });
+    test('Connection with roaming and SPN display', function() {
+      MockMobileConnection.voice.roaming = true;
+      MockMobileConnection.iccInfo.isDisplaySpnRequired = true;
+      var infos = MobileOperator.userFacingInfo(MockMobileConnection);
+      assert.equal(infos.operator, 'Fake short');
+      assert.isUndefined(infos.carrier);
+      assert.isUndefined(infos.region);
+    });
   });
   suite('Brazilian connection', function() {
     test('Connection ', function() {

diff --git a/shared/js/mobile_operator.js b/shared/js/mobile_operator.js
@@ -9,7 +9,8 @@ var MobileOperator = {
     var iccInfo = mobileConnection.iccInfo;
     var operator = network.shortName || network.longName;
 
-    if (iccInfo.isDisplaySpnRequired && iccInfo.spn) {
+    if (iccInfo.isDisplaySpnRequired && iccInfo.spn
+        && !mobileConnection.voice.roaming) {
       if (iccInfo.isDisplayNetworkNameRequired) {
         operator = operator + ' ' + iccInfo.spn;
       } else {