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

Commit 3e178860 authored by Jordan Liu's avatar Jordan Liu Committed by android-build-merger
Browse files

Add null check for mIccRecords 

am: baa82ef7

Change-Id: Ib27249eb7023e3f6b62164f2292ae3a9b2df7c8f
parents 756e2313 baa82ef7

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();