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

Commit 7efd34ef authored by danielwbhuang's avatar danielwbhuang
Browse files

Notify call forwarding indicator when carrier configChanged is changed. 

1.Fix a side-effect of aosp/1285363.
2.Move notifyCallForwardingIndicator from onSubscriptionsChanged() to onCarrierConfigChanged().

Bug: 181747913
Test: manual - verified whether CFU icon was appeared after reboot
Change-Id: I6ab9966231211008de604bdc6e07fad3e5ca24ef
parent 4d04d3f1

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

+1 −1
Original line number Diff line number Diff line
@@ -430,7 +430,6 @@ public class ServiceStateTracker extends Handler { 
            Context context = mPhone.getContext();



            mPhone.notifyPhoneStateChanged();

            mPhone.notifyCallForwardingIndicator();



            if (!SubscriptionManager.isValidSubscriptionId(mPrevSubId)) {

                // just went from invalid to valid subId, so notify with current service
@@ -5046,6 +5045,7 @@ public class ServiceStateTracker extends Handler { 
        updateReportingCriteria(config);

        updateOperatorNamePattern(config);

        mCdnr.updateEfFromCarrierConfig(config);

        mPhone.notifyCallForwardingIndicator();



        // Sometimes the network registration information comes before carrier config is ready.

        // For some cases like roaming/non-roaming overriding, we need carrier config. So it's