diff options
| author | DvTonder <david.vantonder@gmail.com> | 2012-12-16 11:13:07 -0500 |
|---|---|---|
| committer | DvTonder <david.vantonder@gmail.com> | 2012-12-16 11:13:07 -0500 |
| commit | 1fd6a6337a7a9187695131c25fa73237946a0cac (patch) | |
| tree | 6a9681799877c111a91f11d3ba3a0bbecabf1f75 /src/java/com/android/internal/telephony/gsm | |
| parent | 243830fa995a261f9eab44c7ce01bc3f7559a57b (diff) | |
| download | frameworks_opt_telephony-1fd6a6337a7a9187695131c25fa73237946a0cac.zip frameworks_opt_telephony-1fd6a6337a7a9187695131c25fa73237946a0cac.tar.gz frameworks_opt_telephony-1fd6a6337a7a9187695131c25fa73237946a0cac.tar.bz2 | |
Telephony: Forward port National data roaming and make it optional (1/2)
by Robin Morawetz (Rdlgrmpf) and Davor Bertovic (LorD ClockaN)
Id: Ief840d818ecf4b8ebb088fab34f01878d0a9f2d7
Change-Id: Icaaeeebdb85b2c066e0ce2cccc43daac3fa37daa
Diffstat (limited to 'src/java/com/android/internal/telephony/gsm')
| -rw-r--r-- | src/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java b/src/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java index 6110bd1..63e4d97 100644 --- a/src/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java +++ b/src/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java @@ -1283,7 +1283,10 @@ final class GsmServiceStateTracker extends ServiceStateTracker { } catch (Exception e){ } - return gsmRoaming && !(equalsMcc && (equalsOnsl || equalsOnss)); + // Add national roaming and make it optional + 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) { |