Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d28bfe1 authored by Davor Bertovic's avatar Davor Bertovic Committed by Gerrit Code Review
Browse files

Porting National data roaming option from CM9. (1/2) 

by Robin Morawetz (Rdlgrmpf) and Davor Bertovic (LorD ClockaN)

Change-Id: Ief840d818ecf4b8ebb088fab34f01878d0a9f2d7

Conflicts:

	core/java/android/provider/Settings.java
parent a9b0bd66

telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java

+3 −1
Original line number Diff line number Diff line
@@ -1289,7 +1289,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) {