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

Commit de517a68 authored by Yujing Gu's avatar Yujing Gu Committed by Linux Build Service Account
Browse files

Reset the mSpnDisplayCondition to 0. 

When the spn get from local xml file, reset the mSpnDisplayCondition
to 0. Then the spn string will been enable to displayed.

Change-Id: I8843b565a5b2232297eb1b12aac27ca167b47f3b
CRs-Fixed: 1045738
parent ea93e64b

src/java/com/android/internal/telephony/uicc/SIMRecords.java

+9 −0
Original line number Original line Diff line number Diff line
@@ -1629,6 +1629,15 @@ public class SIMRecords extends IccRecords { 
    public int getDisplayRule(String plmn) {

    public int getDisplayRule(String plmn) {

        int rule;

        int rule;





        CarrierConfigManager configLoader = (CarrierConfigManager)

                mContext.getSystemService(Context.CARRIER_CONFIG_SERVICE);

        if (configLoader != null && configLoader.getConfig().getBoolean(

                "config_spn_override_enabled") && !TextUtils.isEmpty(mSpn) &&

                (mSpnDisplayCondition == -1)) {

            if (DBG) log("Set mSpnDisplayCondition to 0 for SPN override");

            mSpnDisplayCondition = 0;

        }



        if (mParentApp != null && mParentApp.getUiccCard() != null &&

        if (mParentApp != null && mParentApp.getUiccCard() != null &&

            mParentApp.getUiccCard().getOperatorBrandOverride() != null) {

            mParentApp.getUiccCard().getOperatorBrandOverride() != null) {

        // If the operator has been overridden, treat it as the SPN file on the SIM did not exist.

        // If the operator has been overridden, treat it as the SPN file on the SIM did not exist.