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

Commit 49d59777 authored by fionaxu's avatar fionaxu Committed by chen xu
Browse files

fix NPE crash in carrierResolver 

1. only read spn from iccrecords when handle sim loaded event
2. enable more logging for debugging

Bug: 112434705
Test: atest FrameworksTelephonyTests
Change-Id: I92c2bb2630769ae3fe984e3ad430984aca89e4e9
Merged-in: I92c2bb2630769ae3fe984e3ad430984aca89e4e9
parent 45a7e67b

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

+2 −2
Original line number Diff line number Diff line
@@ -164,12 +164,12 @@ public class CarrierResolver extends Handler { 
     */

    @Override

    public void handleMessage(Message msg) {

        if (VDBG) logd("handleMessage: " + msg.what);

        if (DBG) logd("handleMessage: " + msg.what);

        switch (msg.what) {

            case SIM_LOAD_EVENT:

            case CARRIER_ID_DB_UPDATE_EVENT:

                mSpn = mIccRecords.getServiceProviderName();

                mPreferApn = getPreferApn();

            case CARRIER_ID_DB_UPDATE_EVENT:

                loadCarrierMatchingRulesOnMccMnc();

                break;

            case SIM_ABSENT_EVENT:

tests/telephonytests/src/com/android/internal/telephony/CarrierResolverTest.java

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ public class CarrierResolverTest extends TelephonyTest { 
    private static final int SIM_LOAD_EVENT       = 1;

    private static final int SIM_ABSENT_EVENT     = 2;

    private static final int ICC_CHANGED_EVENT    = 3;

    private static final int PREFER_APN_SET_EVENT = 5;

    private static final int PREFER_APN_SET_EVENT = 4;



    private CarrierResolver mCarrierResolver;

    private CarrierResolverHandler mCarrierCarrierResolverHandler;