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

Commit 281f04f0 authored by andychou's avatar andychou Committed by android-build-merger
Browse files

Merge "Allow orerride non roaming according carrier configuration for both... 

Merge "Allow orerride non roaming according carrier configuration for both voice roaming or data roaming condition" am: 0dfb1f53
am: 6e8278bd

Change-Id: Iccf4159ec1409faecee08bbad08f5fdbb35ada2e
parents 1b137feb 6e8278bd

src/java/com/android/internal/telephony/ServiceStateTracker.java

+4 −9
Original line number Diff line number Diff line
@@ -2385,21 +2385,16 @@ public class ServiceStateTracker extends Handler { 
             * is set to roaming when either is true.

             *

             * There are exceptions for the above rule.

             * The new SS is not set as roaming while gsm service reports

             * roaming but indeed it is same operator.

             * And the operator is considered non roaming.

             * The new SS is not set as roaming while gsm service or

             * data service reports roaming but indeed it is same

             * operator. And the operator is considered non roaming.

             *

             * The test for the operators is to handle special roaming

             * agreements and MVNO's.

             */

            boolean roaming = (mGsmRoaming || mDataRoaming);



            // for IWLAN case, data is home. Only check voice roaming.

            if (mNewSS.getRilDataRadioTechnology() == ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN) {

                roaming = mGsmRoaming;

            }



            if (mGsmRoaming && !isOperatorConsideredRoaming(mNewSS)

            if (roaming && !isOperatorConsideredRoaming(mNewSS)

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

                log("updateRoamingState: resource override set non roaming.isSameNamedOperators="

                        + isSameNamedOperators(mNewSS) + ",isOperatorConsideredNonRoaming="