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

Commit 6c45d3dc authored by Chen Xu's avatar Chen Xu Committed by android-build-merger
Browse files

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

Merge "Revert "Fix the roaming searching text display in standby screen"" am: 9aa789e6 am: 5a9de1f5
am: 10d17afc

Change-Id: I696acd39bd01bc98fc7486c94a17ea5919e2310e
parents 7e4530c5 10d17afc

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

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

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

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

                                    bool.config_LTE_eri_for_network_name)) &&

                                    (!mIsSubscriptionFromRuim)) {

                                    bool.config_LTE_eri_for_network_name))) {

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

                String eriText = mSS.getOperatorAlpha();

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