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

Commit 746d3fbf authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Telephony: Fix force close issue" into atel.lnx.2.0-dev

parents 85fc82e9 283079a8

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

+9 −9
Original line number Diff line number Diff line
@@ -1628,7 +1628,7 @@ public class SIMRecords extends IccRecords { 
    @Override

    public int getDisplayRule(String plmn) {

        int rule;



        if (mContext != null) {

            CarrierConfigManager configLoader = (CarrierConfigManager)

                     mContext.getSystemService(Context.CARRIER_CONFIG_SERVICE);

            if (configLoader != null && configLoader.getConfig().getBoolean(
@@ -1637,7 +1637,7 @@ public class SIMRecords extends IccRecords { 
                if (DBG) log("Set mSpnDisplayCondition to 0 for SPN override");

                mSpnDisplayCondition = 0;

            }



        }

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

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

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