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

Commit 9aa789e6 authored by Chen Xu's avatar Chen Xu Committed by Gerrit Code Review
Browse files

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

parents 640a22b8 e84c09bf

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

+1 −2
Original line number Original line Diff line number Diff line
@@ -2998,8 +2998,7 @@ public class ServiceStateTracker extends Handler { 
            if (!hasBrandOverride && (mCi.getRadioState().isOn()) && (mPhone.isEriFileLoaded()) &&

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

                    (!ServiceState.isLte(mSS.getRilVoiceRadioTechnology()) ||

                    (!ServiceState.isLte(mSS.getRilVoiceRadioTechnology()) ||

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

                            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

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

                String eriText = mSS.getOperatorAlpha();

                String eriText = mSS.getOperatorAlpha();

                // Now the Phone sees the new ServiceState so it can get the new ERI text

                // Now the Phone sees the new ServiceState so it can get the new ERI text