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

Commit d2ee2822 authored by Amit Mahajan's avatar Amit Mahajan Committed by Android Git Automerger
Browse files

am c187e073: Merge "Roaming blacklist" into lmp-dev 

* commit 'c187e073':
  Roaming blacklist
parents c0c5a58c c187e073

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

+3 −4
Original line number Diff line number Diff line
@@ -850,9 +850,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);
@@ -1476,7 +1475,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);