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

Commit 0eaa5dec authored by Brad Ebinger's avatar Brad Ebinger Committed by android-build-merger
Browse files

Merge "Initialization causes IMS to deregister" 

am: 0624b77b

Change-Id: Ic7f457edd81d14bd374567a43b0dd43ffc0f46f7
parents e8b0d818 0624b77b

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

+0 −1
Original line number Diff line number Diff line
@@ -567,7 +567,6 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
                if (imsManager.isDynamicBinding() || imsManager.isServiceAvailable()) {

                    mImsServiceReady = true;

                    updateImsPhone();

                    ImsManager.updateImsServiceConfig(mContext, mPhoneId, false);

                }

            }

        }

src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java

+5 −1
Original line number Diff line number Diff line
@@ -3298,7 +3298,11 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
            mShouldUpdateImsConfigOnDisconnect = false;

        }



        if (!mShouldUpdateImsConfigOnDisconnect) {



        // We do not want to update the ImsConfig for REASON_REGISTERED, since it can happen before

        // the carrier config has loaded and will deregister IMS.

        if (!mShouldUpdateImsConfigOnDisconnect

                && reason != DataEnabledSettings.REASON_REGISTERED) {

            // This will call into updateVideoCallFeatureValue and eventually all clients will be

            // asynchronously notified that the availability of VT over LTE has changed.

            ImsManager.updateImsServiceConfig(mPhone.getContext(), mPhone.getPhoneId(), true);