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

Commit 72aae6de authored by Pengquan Meng's avatar Pengquan Meng
Browse files

Trigger updateSpnDisplay() after eri loaded 

updateSpnDisplay() may not be triggered after Eri laoded because the
service state is not change.

This change will trigger updateSpnDisplay() even if the service state is
not changed.

Bug: 134672236
Test: build
Change-Id: I7a77882262220db90c48c338993dd5c59dfce2d1
parent 751b1604

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();