summaryrefslogtreecommitdiffstats
path: root/telephony
diff options
context:
space:
mode:
authorDavor Bertovic <davor@losinj.com>2012-02-22 20:43:38 +0100
committerSteve Kondik <shade@chemlab.org>2012-02-28 23:35:18 -0800
commita3897015d7d41b42b2c7b4a13e055683a93e1d4d (patch)
tree61eb301aeae884c5d52ef53f1ff269ef6936e468 /telephony
parentedcd72a59ecc14ab3bcd681675611c73f55c46cf (diff)
downloadframeworks_base-a3897015d7d41b42b2c7b4a13e055683a93e1d4d.zip
frameworks_base-a3897015d7d41b42b2c7b4a13e055683a93e1d4d.tar.gz
frameworks_base-a3897015d7d41b42b2c7b4a13e055683a93e1d4d.tar.bz2
Add national data roaming and make it optional (1/2)
by Robin Morawetz (Rdlgrmpf) and Davor Bertovic (LorD ClockaN) Change-Id: Ief840d818ecf4b8ebb088fab34f01878d0a9f2d7
Diffstat (limited to 'telephony')
-rw-r--r--telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java b/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
index 84127cf..9e8a830 100644
--- a/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
+++ b/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
@@ -1220,7 +1220,9 @@ final class GsmServiceStateTracker extends ServiceStateTracker {
} catch (Exception e){
}
- return gsmRoaming && !(equalsMcc && (equalsOnsl || equalsOnss));
+ boolean mvnoRoaming = Settings.System.getInt(phone.getContext().getContentResolver(),
+ Settings.System.MVNO_ROAMING, 0) == 1;
+ return gsmRoaming && !(equalsMcc && (equalsOnsl || equalsOnss || mvnoRoaming));
}
private static int twoDigitsAt(String s, int offset) {