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

Commit 2f067bf9 authored by Jordan Liu's avatar Jordan Liu Committed by android-build-merger
Browse files

Add null check for mIccRecords am: baa82ef7 

am: 3e178860

Change-Id: I8eb8ed68a05eff21f2cb2039125c60bea71e7be7
parents 1e58964d 3e178860

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

+5 −1
Original line number Diff line number Diff line
@@ -167,7 +167,11 @@ public class CarrierResolver extends Handler { 
        if (DBG) logd("handleMessage: " + msg.what);

        switch (msg.what) {

            case SIM_LOAD_EVENT:

                if (mIccRecords != null) {

                    mSpn = mIccRecords.getServiceProviderName();

                } else {

                    loge("mIccRecords is null on SIM_LOAD_EVENT, could not get SPN");

                }

                mPreferApn = getPreferApn();

            case CARRIER_ID_DB_UPDATE_EVENT:

                loadCarrierMatchingRulesOnMccMnc();