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

Commit 77911cf4 authored by Jack Yu's avatar Jack Yu Committed by Automerger Merge Worker
Browse files

Do not use operator numeric from modem for IWLAN am: 407df1f5 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/12413008

Change-Id: I2b65d7eddbd59b33801bab4f7ee181be9fe7d480
parents dcb70571 407df1f5

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

+6 −4
Original line number Diff line number Diff line
@@ -3502,13 +3502,15 @@ public class ServiceStateTracker extends Handler { 


            tm.setNetworkOperatorNumericForPhone(mPhone.getPhoneId(), operatorNumeric);



            // If the OPERATOR command hasn't returned a valid operator, but if the device has

            // camped on a cell either to attempt registration or for emergency services, then

            // for purposes of setting the locale, we don't care if registration fails or is

            // If the OPERATOR command hasn't returned a valid operator or the device is on IWLAN (

            // because operatorNumeric would be SIM's mcc/mnc when device is on IWLAN), but if the

            // device has camped on a cell either to attempt registration or for emergency services,

            // then for purposes of setting the locale, we don't care if registration fails or is

            // incomplete.

            // CellIdentity can return a null MCC and MNC in CDMA

            String localeOperator = operatorNumeric;

            if (isInvalidOperatorNumeric(operatorNumeric)) {

            if (isInvalidOperatorNumeric(operatorNumeric)

                    || mSS.getDataNetworkType() == TelephonyManager.NETWORK_TYPE_IWLAN) {

                for (CellIdentity cid : prioritizedCids) {

                    if (!TextUtils.isEmpty(cid.getPlmn())) {

                        localeOperator = cid.getPlmn();