diff options
| author | Manuel Auer <auer.manuel@gmail.com> | 2010-11-24 21:55:18 +0100 |
|---|---|---|
| committer | Manuel Auer <auer.manuel@gmail.com> | 2010-11-24 21:55:18 +0100 |
| commit | 470879c21ccf17d37eacde0990e1236389c88b42 (patch) | |
| tree | aa6b6ae25ccd56f08aee8fd7c4131d2468dc3fc9 | |
| parent | dccd67a9416b26a206e8226894732467dcccb617 (diff) | |
| download | frameworks_base-470879c21ccf17d37eacde0990e1236389c88b42.zip frameworks_base-470879c21ccf17d37eacde0990e1236389c88b42.tar.gz frameworks_base-470879c21ccf17d37eacde0990e1236389c88b42.tar.bz2 | |
Add option for MVNO roaming fix. Making commit bc097e94dfd15ecaac4d057d30c68d9c77a54744 switchable.
Change-Id: I66c5e5bcda6b0bfa42dbdbcce6bca34abd880182
| -rw-r--r-- | core/java/android/provider/Settings.java | 2 | ||||
| -rw-r--r-- | telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 8614862..cc5b515 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -2671,6 +2671,8 @@ public final class Settings { @Deprecated public static final String WIFI_WATCHDOG_PING_TIMEOUT_MS = Secure.WIFI_WATCHDOG_PING_TIMEOUT_MS; + + public static final String BUTTON_MVNO_ROAMING_KEY = "button_mvno_roaming_key"; } /** diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java b/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java index 50b8eba..9940fa8 100644 --- a/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java +++ b/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java @@ -1286,7 +1286,18 @@ final class GsmServiceStateTracker extends ServiceStateTracker { * @return true for roaming state set */ private boolean isRoamingBetweenOperators(boolean gsmRoaming, ServiceState s) { - String spn = SystemProperties.get(TelephonyProperties.PROPERTY_ICC_OPERATOR_ALPHA, "empty"); + + boolean mvnoRoaming = Settings.System.getInt( + phone.getContext().getContentResolver(), + Settings.System.BUTTON_MVNO_ROAMING_KEY, 0) == 1; + + String spn; + + if (!mvnoRoaming) { + spn = SystemProperties.get(TelephonyProperties.PROPERTY_ICC_OPERATOR_ALPHA, "empty"); + } else { + spn = SystemProperties.get(TelephonyProperties.PROPERTY_ICC_OPERATOR_ALPHA, ""); + } String onsl = s.getOperatorAlphaLong(); String onss = s.getOperatorAlphaShort(); |