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

Commit a2bfbd34 authored by Tyler Gunn's avatar Tyler Gunn Committed by Android (Google) Code Review
Browse files

Merge "Move MMTEL feature capabilities reset into MmTelFeatureCompatAdapter." into pi-dev

parents 917a49ea 0efb7f4b

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

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




        @Override

        @Override

        public void registrationDisconnected(ImsReasonInfo imsReasonInfo) throws RemoteException {

        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

            // Implemented in the Registration Adapter

        }

        }

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

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

                @Override

                public void onDeregistered(ImsReasonInfo imsReasonInfo) {

                public void onDeregistered(ImsReasonInfo imsReasonInfo) {

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

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

                    resetImsCapabilities();

                    mPhone.setServiceState(ServiceState.STATE_OUT_OF_SERVICE);

                    mPhone.setServiceState(ServiceState.STATE_OUT_OF_SERVICE);

                    mPhone.setImsRegistered(false);

                    mPhone.setImsRegistered(false);

                    mPhone.processDisconnectReason(imsReasonInfo);

                    mPhone.processDisconnectReason(imsReasonInfo);