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

Commit e72d5449 authored by Jack Yu's avatar Jack Yu
Browse files

Fixed the incorrect roaming override 

If the empty string is in the roaming override resource overlay,
it might incorrectly override the roaming state.

Test: Manual
bug: 63687431
Merged-In: I6629b2b4815f6740ada4bd0a69eb2bf8829db1fc
Change-Id: I6629b2b4815f6740ada4bd0a69eb2bf8829db1fc
parent 7d64fae5

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

+7 −4
Original line number Diff line number Diff line
@@ -2060,8 +2060,11 @@ public class ServiceStateTracker extends Handler { 
            // carrier config possibly overrides it.

            mNewSS.setDataRoamingFromRegistration(roaming);



            if (mGsmRoaming && !isOperatorConsideredRoaming(mNewSS) &&

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

            if (mGsmRoaming && !isOperatorConsideredRoaming(mNewSS)

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

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

                        + isSameNamedOperators(mNewSS) + ",isOperatorConsideredNonRoaming="

                        + isOperatorConsideredNonRoaming(mNewSS));

                roaming = false;

            }
@@ -3308,7 +3311,7 @@ public class ServiceStateTracker extends Handler { 
        }



        for (String numeric : numericArray) {

            if (operatorNumeric.startsWith(numeric)) {

            if (!TextUtils.isEmpty(numeric) && operatorNumeric.startsWith(numeric)) {

                return true;

            }

        }
@@ -3332,7 +3335,7 @@ public class ServiceStateTracker extends Handler { 
        }



        for (String numeric : numericArray) {

            if (operatorNumeric.startsWith(numeric)) {

            if (!TextUtils.isEmpty(numeric) && operatorNumeric.startsWith(numeric)) {

                return true;

            }

        }