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

Commit 4b78fb8f authored by Tyler Gunn's avatar Tyler Gunn Committed by android-build-merger
Browse files

Merge "Move MMTEL feature capabilities reset into MmTelFeatureCompatAdapter."... 

Merge "Move MMTEL feature capabilities reset into MmTelFeatureCompatAdapter." into pi-dev am: a2bfbd34
am: e642c5b1

Change-Id: I0576ffbfcbd82452eff3e0e4a9bb889bf77f9df0
parents 6771857e e642c5b1

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);