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

Commit 0e0692f3 authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "For national roaming only consider MCC, previous version didn't work on... 

Merge "For national roaming only consider MCC, previous version didn't work on Motorola Milestone" into froyo
parents 04d8fc70 b9cba2c6

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

+2 −6
Original line number Diff line number Diff line
@@ -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, "");

        }



        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) {