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

Commit 7004f6b4 authored by Amit Mahajan's avatar Amit Mahajan
Browse files

Use new registered_plmn carrier config. 

This new config is a temporary way to override registered PLMN  name
for CDMA in home network.

Test: manual
Bug: 80145031
Merged-in: I9869437df7230b48abd9a7f690bc50bee311093a
Change-Id: I9869437df7230b48abd9a7f690bc50bee311093a
(cherry picked from commit 8d07a0df)
parent 7b0ca89a

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

+24 −0
Original line number Diff line number Diff line
@@ -2221,8 +2221,32 @@ public class ServiceStateTracker extends Handler { 
        mNewSS.setCdmaEriIconIndex(EriInfo.ROAMING_INDICATOR_OFF);

    }



    private void updateOperatorNameFromCarrierConfig() {

        // Brand override gets a priority over carrier config. If brand override is not available,

        // override the operator name in home network. Also do this only for CDMA. This is temporary

        // and should be fixed in a proper way in a later release.

        if (!mPhone.isPhoneTypeGsm() && !mSS.getRoaming()) {

            boolean hasBrandOverride = mUiccController.getUiccCard(getPhoneId()) != null

                    && mUiccController.getUiccCard(getPhoneId()).getOperatorBrandOverride() != null;

            if (!hasBrandOverride) {

                PersistableBundle config = getCarrierConfig();

                if (config.getBoolean(

                        CarrierConfigManager.KEY_CDMA_HOME_REGISTERED_PLMN_NAME_OVERRIDE_BOOL)) {

                    String operator = config.getString(

                            CarrierConfigManager.KEY_CDMA_HOME_REGISTERED_PLMN_NAME_STRING);

                    log("updateOperatorNameFromCarrierConfig: changing from "

                            + mSS.getOperatorAlpha() + " to " + operator);

                    // override long and short operator name, keeping numeric the same

                    mSS.setOperatorName(operator, operator, mSS.getOperatorNumeric());

                }

            }

        }

    }



    protected void updateSpnDisplay() {

        updateOperatorNameFromEri();

        // carrier config gets a priority over ERI

        updateOperatorNameFromCarrierConfig();



        String wfcVoiceSpnFormat = null;

        String wfcDataSpnFormat = null;