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

Commit cb639120 authored by w19976's avatar w19976 Committed by Amit Mahajan
Browse files

Roaming blacklist 

Rename isSameOperatorConsideredRoaming to isOperatorConsideredRoaming.
Have isOperatorConsideredRoaming take precedence over isOperatorConsideredNonRoaming.
This makes it easier to blacklist specific networks that lie within a
whitelist range (eg, whitelist all carriers under 310xxx except 310410).

Bug: 17684236
Change-Id: I2275cd3375e810a0a17ff28bf518e4ff5420cc14
parent b30d3481

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

+3 −4
Original line number Diff line number Diff line
@@ -826,9 +826,8 @@ final class GsmServiceStateTracker extends ServiceStateTracker { 
             * agreements and MVNO's.

             */

            boolean roaming = (mGsmRoaming || mDataRoaming);

            if ((mGsmRoaming && isSameNamedOperators(mNewSS)

                        && !isSameNamedOperatorConsideredRoaming(mNewSS))

                    || isOperatorConsideredNonRoaming(mNewSS)) {

            if (mGsmRoaming && !isOperatorConsideredRoaming(mNewSS) &&

                (isSameNamedOperators(mNewSS) || isOperatorConsideredNonRoaming(mNewSS))) {

                roaming = false;

            }

            mNewSS.setRoaming(roaming);
@@ -1456,7 +1455,7 @@ final class GsmServiceStateTracker extends ServiceStateTracker { 
        return false;

    }



    private boolean isSameNamedOperatorConsideredRoaming(ServiceState s) {

    private boolean isOperatorConsideredRoaming(ServiceState s) {

        String operatorNumeric = s.getOperatorNumeric();

        String[] numericArray = mPhone.getContext().getResources().getStringArray(

                    com.android.internal.R.array.config_sameNamedOperatorConsideredRoaming);