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

Commit eafbacd6 authored by Pengquan Meng's avatar Pengquan Meng Committed by android-build-merger
Browse files

Merge "Trigger updateSpnDisplay() after eri loaded" into qt-r1-dev am: 9a6822f0 

am: ec91ac7b

Change-Id: Ic03645b05cd485ef68ce3b9366f6ed0e5f1df56a
parents a5fa5153 ec91ac7b

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

+10 −1
Original line number Diff line number Diff line
@@ -546,6 +546,7 @@ public class ServiceStateTracker extends Handler { 
    private String mPrlVersion;

    private boolean mIsMinInfoReady = false;

    private boolean mIsEriTextLoaded = false;

    private String mEriText;

    @UnsupportedAppUsage

    private boolean mIsSubscriptionFromRuim = false;

    private CdmaSubscriptionSourceManager mCdmaSSM;
@@ -3260,9 +3261,17 @@ public class ServiceStateTracker extends Handler { 
            setNotification(CS_REJECT_CAUSE_ENABLED);

        }



        if (hasChanged) {

        String eriText = mPhone.getCdmaEriText();

        boolean hasEriChanged = !TextUtils.equals(mEriText, eriText);

        mEriText = eriText;

        // Trigger updateSpnDisplay when

        // 1. Service state is changed.

        // 2. phone type is Cdma or CdmaLte and ERI text has changed.

        if (hasChanged || (!mPhone.isPhoneTypeGsm() && hasEriChanged)) {

            updateSpnDisplay();

        }



        if (hasChanged) {

            tm.setNetworkOperatorNameForPhone(mPhone.getPhoneId(), mSS.getOperatorAlpha());

            String operatorNumeric = mSS.getOperatorNumeric();