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

Commit 97a0d4f0 authored by Jayachandran Chinnakkannu's avatar Jayachandran Chinnakkannu Committed by Android (Google) Code Review
Browse files

Merge "If PS RAT is IWLAN, data romaing should be home" into qt-r1-dev

parents 41ca7655 31ce02c5

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

+5 −0
Original line number Diff line number Diff line
@@ -2391,6 +2391,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="