diff options
| author | philenotfound <phil.eichinger@gmail.com> | 2010-11-29 23:02:00 +0100 |
|---|---|---|
| committer | philenotfound <phil.eichinger@gmail.com> | 2010-11-29 23:02:00 +0100 |
| commit | b9cba2c61b34b77af99e2cca7e87721e8a0f7b36 (patch) | |
| tree | a8eec46354664f999b1ec002839cfae1ecd20a23 | |
| parent | a814ad7ab5d915224f54e5cd2c89b755414547a8 (diff) | |
| download | frameworks_base-b9cba2c61b34b77af99e2cca7e87721e8a0f7b36.zip frameworks_base-b9cba2c61b34b77af99e2cca7e87721e8a0f7b36.tar.gz frameworks_base-b9cba2c61b34b77af99e2cca7e87721e8a0f7b36.tar.bz2 | |
For national roaming only consider MCC, previous version didn't work on Motorola Milestone
Change-Id: Ibc0a988149eb0a670aff45fd1e3dc9d0841bdf9a
| -rw-r--r-- | telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java | 8 |
1 files 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) { |