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

Commit cc95af4f authored by Tyler Gunn's avatar Tyler Gunn Committed by Gerrit Code Review
Browse files

Merge "Move MMTEL feature capabilities reset into MmTelFeatureCompatAdapter."

parents 9c936de4 bbbda2e5

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
@@ -2799,7 +2799,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);