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

Commit 07361401 authored by Tyler Gunn's avatar Tyler Gunn Committed by Android (Google) Code Review
Browse files

Merge "IMS: Don't create IMS phone when switch to SIP Phone" into mnc-dev

parents 87a1addd fa02ee35

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

+7 −2
Original line number Diff line number Diff line
@@ -463,8 +463,9 @@ public abstract class PhoneBase extends Handler implements Phone { 
        mSmsUsageMonitor = new SmsUsageMonitor(context);

        mUiccController = UiccController.getInstance();

        mUiccController.registerForIccChanged(this, EVENT_ICC_CHANGED, null);



        if (getPhoneType() != PhoneConstants.PHONE_TYPE_SIP) {

            mCi.registerForSrvccStateChanged(this, EVENT_SRVCC_STATE_CHANGED, null);

        }

        mCi.setOnUnsolOemHookRaw(this, EVENT_UNSOL_OEM_HOOK_RAW, null);

        mCi.startLceService(DEFAULT_REPORT_INTERVAL_MS, LCE_PULL_MODE,

                obtainMessage(EVENT_CONFIG_LCE));
@@ -472,6 +473,10 @@ public abstract class PhoneBase extends Handler implements Phone { 


    @Override

    public void startMonitoringImsService() {

        if (getPhoneType() == PhoneConstants.PHONE_TYPE_SIP) {

            return;

        }



        synchronized(PhoneProxy.lockForRadioTechnologyChange) {

            IntentFilter filter = new IntentFilter();

            filter.addAction(ImsManager.ACTION_IMS_SERVICE_UP);