summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java8
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) {