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

Commit d61a1880 authored by Dan Pasanen's avatar Dan Pasanen Committed by Adnan Begovic
Browse files

CdmaLteServiceStateTracker: allow forcing reading eri from xml 

* Some devices rely on eri.xml for their cdma text display and
  must be forced to use it. Not reading from eri.xml results in
  weird carrier display like NAM1 when on a cdma data network

Change-Id: I73cbedafda912e52817d57e791bf57f8fb32ab48
parent ed68de07

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

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

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

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

            boolean forceEriFromXml =

                    SystemProperties.getBoolean("ro.ril.force_eri_from_xml", false);

            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)) && !mIsSubscriptionFromRuim) {

                     bool.config_LTE_eri_for_network_name)) &&

                     (!mIsSubscriptionFromRuim || forceEriFromXml)) {

                // 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