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

Commit fa02ee35 authored by Shriram Ganesh's avatar Shriram Ganesh Committed by Tyler Gunn
Browse files

IMS: Don't create IMS phone when switch to SIP Phone 

SIP Phone creates IMS phone while phone switch to SIP
phone when dial an SIP call.
Don't register receiver for Ims service state change
and SRVCC state change in case of SIP phone.
This way creatation of duplicate IMS phone will be
prevented when switch to SIP phone.

Bug: 22126128
Change-Id: I1206aaab703fec70107554352c2728e7dd42578e
parent d2137887

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

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

        mSmsUsageMonitor = new SmsUsageMonitor(context);

        mUiccController = UiccController.getInstance();

        mUiccController = UiccController.getInstance();

        mUiccController.registerForIccChanged(this, EVENT_ICC_CHANGED, null);

        mUiccController.registerForIccChanged(this, EVENT_ICC_CHANGED, null);



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

            mCi.registerForSrvccStateChanged(this, EVENT_SRVCC_STATE_CHANGED, null);

            mCi.registerForSrvccStateChanged(this, EVENT_SRVCC_STATE_CHANGED, null);

        }

        mCi.setOnUnsolOemHookRaw(this, EVENT_UNSOL_OEM_HOOK_RAW, null);

        mCi.setOnUnsolOemHookRaw(this, EVENT_UNSOL_OEM_HOOK_RAW, null);

        mCi.startLceService(DEFAULT_REPORT_INTERVAL_MS, LCE_PULL_MODE,

        mCi.startLceService(DEFAULT_REPORT_INTERVAL_MS, LCE_PULL_MODE,

                obtainMessage(EVENT_CONFIG_LCE));

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




    @Override

    @Override

    public void startMonitoringImsService() {

    public void startMonitoringImsService() {

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

            return;

        }



        synchronized(PhoneProxy.lockForRadioTechnologyChange) {

        synchronized(PhoneProxy.lockForRadioTechnologyChange) {

            IntentFilter filter = new IntentFilter();

            IntentFilter filter = new IntentFilter();

            filter.addAction(ImsManager.ACTION_IMS_SERVICE_UP);

            filter.addAction(ImsManager.ACTION_IMS_SERVICE_UP);