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

Commit e6992ac8 authored by Amit Mahajan's avatar Amit Mahajan
Browse files

Change to display correct network name on locked/quick settings screen. 

Bug: 18161228
Change-Id: Ic5ab163ba238958ac74a4651425c9d2041e6e251
parent d21febaf

src/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java

+4 −1
Original line number Diff line number Diff line
@@ -433,7 +433,10 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker { 
        if (hasChanged) {

            boolean hasBrandOverride = mUiccController.getUiccCard() == null ? false :

                    (mUiccController.getUiccCard().getOperatorBrandOverride() != null);

            if (!hasBrandOverride && (mCi.getRadioState().isOn()) && (mPhone.isEriFileLoaded())) {

            if (!hasBrandOverride && (mCi.getRadioState().isOn()) && (mPhone.isEriFileLoaded()) &&

                    (mSS.getRilVoiceRadioTechnology() != ServiceState.RIL_RADIO_TECHNOLOGY_LTE ||

                            mPhone.getContext().getResources().getBoolean(com.android.internal.R.

                                    bool.config_LTE_eri_for_network_name))) {

                // Only when CDMA is in service, ERI will take effect

                String eriText = mSS.getOperatorAlphaLong();

                // Now the CDMAPhone sees the new ServiceState so it can get the

src/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java

+2 −3
Original line number Diff line number Diff line
@@ -765,9 +765,8 @@ public class CdmaServiceStateTracker extends ServiceStateTracker { 
                    }



                    if (!mIsSubscriptionFromRuim) {

                        // In CDMA in case on NV, the ss.mOperatorAlphaLong is set later with the

                        // ERI text, so here it is ignored what is coming from the modem.

                        mNewSS.setOperatorName(null, opNames[1], opNames[2]);

                        // NV device (as opposed to CSIM)

                        mNewSS.setOperatorName(opNames[0], opNames[1], opNames[2]);

                    } else {

                        String brandOverride = mUiccController.getUiccCard() != null ?

                            mUiccController.getUiccCard().getOperatorBrandOverride() : null;