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

Commit 6e8ec6c8 authored by Chen Xu's avatar Chen Xu Committed by Gerrit Code Review
Browse files

Merge "add NullPointerCheck for serviceStateTracker"

parents 36a94115 daca5804

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

+7 −3
Original line number Diff line number Diff line
@@ -162,14 +162,18 @@ public class CarrierActionAgent extends Handler { 
                    mSettingsObserver.observe(

                            Settings.Global.getUriFor(Settings.Global.AIRPLANE_MODE_ON),

                            EVENT_APM_SETTINGS_CHANGED);

                    if (mPhone.getServiceStateTracker() != null) {

                        mPhone.getServiceStateTracker().registerForDataRoamingOff(

                                this, EVENT_DATA_ROAMING_OFF, null, false);

                    }

                } else if (IccCardConstants.INTENT_VALUE_ICC_ABSENT.equals(iccState)) {

                    log("EVENT_SIM_STATE_CHANGED status: " + iccState);

                    carrierActionReset();

                    mSettingsObserver.unobserve();

                    if (mPhone.getServiceStateTracker() != null) {

                        mPhone.getServiceStateTracker().unregisterForDataRoamingOff(this);

                    }

                }

                break;

            default:

                loge("Unknown carrier action: " + msg.what);

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

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ public class CarrierActionAgentTest extends TelephonyTest { 
        intent.putExtra(IccCardConstants.INTENT_KEY_ICC_STATE,

                IccCardConstants.INTENT_VALUE_ICC_LOADED);

        mContext.sendBroadcast(intent);

        waitForMs(100);

        waitForMs(200);



        // carrier actions triggered from sim loading

        ArgumentCaptor<Message> message = ArgumentCaptor.forClass(Message.class);