From b9cba2c61b34b77af99e2cca7e87721e8a0f7b36 Mon Sep 17 00:00:00 2001 From: philenotfound Date: Mon, 29 Nov 2010 23:02:00 +0100 Subject: For national roaming only consider MCC, previous version didn't work on Motorola Milestone Change-Id: Ibc0a988149eb0a670aff45fd1e3dc9d0841bdf9a --- .../android/internal/telephony/gsm/GsmServiceStateTracker.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java b/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java index 36de23b..68a6b45 100644 --- a/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java +++ b/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java @@ -1293,11 +1293,7 @@ final class GsmServiceStateTracker extends ServiceStateTracker { String spn; - if (!mvnoRoaming) { - spn = SystemProperties.get(TelephonyProperties.PROPERTY_ICC_OPERATOR_ALPHA, "empty"); - } else { - spn = SystemProperties.get(TelephonyProperties.PROPERTY_ICC_OPERATOR_ALPHA, ""); - } + spn = SystemProperties.get(TelephonyProperties.PROPERTY_ICC_OPERATOR_ALPHA, "empty"); String onsl = s.getOperatorAlphaLong(); String onss = s.getOperatorAlphaShort(); @@ -1316,7 +1312,7 @@ final class GsmServiceStateTracker extends ServiceStateTracker { } catch (Exception e){ } - return gsmRoaming && !(equalsMcc && (equalsOnsl || equalsOnss)); + return gsmRoaming && !(equalsMcc && (equalsOnsl || equalsOnss || mvnoRoaming)); } private static int twoDigitsAt(String s, int offset) { -- cgit v1.1