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

Commit 0efb7f4b authored by Tyler Gunn's avatar Tyler Gunn
Browse files

Move MMTEL feature capabilities reset into MmTelFeatureCompatAdapter. 

ImsPhoneCallTracker currently resets the feature capabilities which are
available when IMS is de-registered.  Moving this to the compat adapter
as it is now expected that an ImsService which does not make use of the
compat adapter will inform the framework of capability changes prior to
de-registration.

Bug: 73076695
Test: Enable airplane mode and inspect logs to ensure feature capabilities
are reset to 0.

Change-Id: Iee2ecb3fb9f0a6edf18570fe65abb9827e048fbd
parent 30d9361a

src/java/com/android/internal/telephony/ims/MmTelFeatureCompatAdapter.java

+4 −0
Original line number Diff line number Diff line
@@ -155,6 +155,10 @@ public class MmTelFeatureCompatAdapter extends MmTelFeature { 


        @Override

        public void registrationDisconnected(ImsReasonInfo imsReasonInfo) throws RemoteException {

            // At de-registration, notify the framework that no IMS capabilities are currently

            // available.

            Log.i(TAG, "registrationDisconnected: resetting MMTEL capabilities.");

            notifyCapabilitiesStatusChanged(new MmTelCapabilities());

            // Implemented in the Registration Adapter

        }

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

+0 −1
Original line number Diff line number Diff line
@@ -2884,7 +2884,6 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
                @Override

                public void onDeregistered(ImsReasonInfo imsReasonInfo) {

                    if (DBG) log("onImsDisconnected imsReasonInfo=" + imsReasonInfo);

                    resetImsCapabilities();

                    mPhone.setServiceState(ServiceState.STATE_OUT_OF_SERVICE);

                    mPhone.setImsRegistered(false);

                    mPhone.processDisconnectReason(imsReasonInfo);