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

Commit 3a628e48 authored by Dan Pasanen's avatar Dan Pasanen Committed by Steve Kondik
Browse files

Revert "Revert "Fix the roaming searching text display in standby screen"" 

* This reverts commit 28d9c73f but allows
  a device to opt for the reverted commit's behavior by setting
  ro.ril.force_eri_from_xml=true

* The reverted commit seems to break some devices that use mcc/mnc overlays
  for eri.xml while at the same time fixing some that use a standard eri.xml
  overlay.

Change-Id: If46f8e378d68657320d26874d06fb7fc39421326
parent 009d2f5c

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

+1 −1
Original line number Diff line number Diff line
@@ -478,7 +478,7 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker { 
            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))) {

                     bool.config_LTE_eri_for_network_name)) && !mIsSubscriptionFromRuim) {

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