diff options
| author | Steve Kondik <shade@chemlab.org> | 2010-12-03 18:21:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.cyanogenmod.com> | 2010-12-03 18:21:09 +0000 |
| commit | 0e0692f3b67eb3dc770d3eecea819280a8e97688 (patch) | |
| tree | a00d5f881dd88aaa9064d9858c2a0f37c6fab250 | |
| parent | 04d8fc705dcd80dd0a91f9f811c6aa8fe7329ba6 (diff) | |
| parent | b9cba2c61b34b77af99e2cca7e87721e8a0f7b36 (diff) | |
| download | frameworks_base-0e0692f3b67eb3dc770d3eecea819280a8e97688.zip frameworks_base-0e0692f3b67eb3dc770d3eecea819280a8e97688.tar.gz frameworks_base-0e0692f3b67eb3dc770d3eecea819280a8e97688.tar.bz2 | |
Merge "For national roaming only consider MCC, previous version didn't work on Motorola Milestone" into froyo
| -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) { |