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

Commit de722d3d authored by Brad Ebinger's avatar Brad Ebinger
Browse files

Remove old state from ImsManager 

Test: atest FrameworksTelephonyTests ImsCommonTests
Change-Id: I6b12ca5c9c17f8f4aadce5ff8c00793a23de5241
parent 99c78ed9

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

+1 −1
Original line number Diff line number Diff line
@@ -2796,7 +2796,7 @@ public class GsmCdmaPhone extends Phone { 
                // updated when ImsPhoneCallTracker opens a connection.

                ImsManager imsManager = ImsManager.getInstance(mContext, mPhoneId);

                if (imsManager.isServiceAvailable()) {

                    imsManager.updateImsServiceConfig(true);

                    imsManager.updateImsServiceConfig();

                } else {

                    logd("ImsManager is not available to update CarrierConfig.");

                }

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

+5 −5
Original line number Diff line number Diff line
@@ -832,7 +832,7 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 


    /**

     * TODO: Remove this code; it is a workaround.

     * When {@code true}, forces {@link ImsManager#updateImsServiceConfig(boolean)} to

     * When {@code true}, forces {@link ImsManager#updateImsServiceConfig} to

     * be called when an ongoing video call is disconnected.  In some cases, where video pause is

     * supported by the carrier, when {@link #onDataEnabledChanged(boolean, int)} reports that data

     * has been disabled we will pause the video rather than disconnecting the call.  When this
@@ -1002,7 +1002,7 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
        }



        if (mCarrierConfigLoaded) {

            mImsManager.updateImsServiceConfig(true);

            mImsManager.updateImsServiceConfig();

        }

        // For compatibility with apps that still use deprecated intent

        sendImsServiceStateIntent(ImsManager.ACTION_IMS_SERVICE_UP);
@@ -3027,7 +3027,7 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
                // Ensure we update the IMS config when the call is disconnected; we delayed this

                // because a video call was paused.

                if (mImsManager != null) {

                    mImsManager.updateImsServiceConfig(true);

                    mImsManager.updateImsServiceConfig();

                }

                mShouldUpdateImsConfigOnDisconnect = false;

            }
@@ -3729,7 +3729,7 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
                    || item == ImsConfig.ConfigConstants.LVC_SETTING_ENABLED)) {

                // Update Ims Service state to make sure updated provisioning values take effect

                // immediately.

                mImsManager.updateImsServiceConfig(true);

                mImsManager.updateImsServiceConfig();

            }

        }
@@ -4582,7 +4582,7 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
            // This will call into updateVideoCallFeatureValue and eventually all clients will be

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

            if (mImsManager != null) {

                mImsManager.updateImsServiceConfig(true);

                mImsManager.updateImsServiceConfig();

            }

        }

    }