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

Commit 964049a7 authored by andychou's avatar andychou Committed by android-build-merger
Browse files

Merge "If PS RAT is IWLAN, data romaing should be home" am: b55b4ff0 

am: ec69c865

Change-Id: I471e313b60de3f1eb3ac99f3b5f4d0f074648862
parents c0503a83 ec69c865

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

+5 −0
Original line number Diff line number Diff line
@@ -2394,6 +2394,11 @@ public class ServiceStateTracker extends Handler { 
             */

            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)

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

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