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

Commit 7e7b43a4 authored by andychou's avatar andychou
Browse files

Allow orerride non roaming according carrier configuration for both 

voice roaming or data roaming condition

For LTE environment, a lot of carrier support LTE only condition since
voice go over LTE.
Also some MVNO have domestic roaming with LTE only and that should be
treated as home.
So we need to allow override roaming state even in data roaming
condition.

Bug: 133260098
Test: make
Change-Id: I17e6efe4cb72ec8bccb0583c44ed702af206b0f7
parent b55b4ff0

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="