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

Commit e01ce3f0 authored by Brad Ebinger's avatar Brad Ebinger Committed by Gerrit Code Review
Browse files

Merge "Fix ImsMmTelManager API in accordance with the council"

parents ade80819 0c883457

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

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ public class ImsSmsDispatcher extends SMSDispatcher { 
                }



                @Override

                public void onDeregistered(ImsReasonInfo info) {

                public void onUnregistered(ImsReasonInfo info) {

                    Rlog.d(TAG, "onImsDisconnected imsReasonInfo=" + info);

                    synchronized (mLock) {

                        mIsRegistered = false;

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

+1 −1
Original line number Diff line number Diff line
@@ -2973,7 +2973,7 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
                }



                @Override

                public void onDeregistered(ImsReasonInfo imsReasonInfo) {

                public void onUnregistered(ImsReasonInfo imsReasonInfo) {

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

                    mPhone.setServiceState(ServiceState.STATE_OUT_OF_SERVICE);

                    mPhone.setImsRegistered(false);

tests/telephonytests/src/android/telephony/ims/ImsRegistrationTests.java

+1 −1
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ public class ImsRegistrationTests { 
    public void testRegistrationCallbackNoCallbackIfUnknown() throws RemoteException {

        mRegBinder.addRegistrationCallback(mCallback2);

        // Verify that if we have never set the registration state, we do not callback immediately

        // with onDeregistered.

        // with onUnregistered.

        verify(mCallback2, never()).onDeregistered(any(ImsReasonInfo.class));

    }

}

tests/telephonytests/src/com/android/internal/telephony/imsphone/ImsPhoneCallTrackerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ public class ImsPhoneCallTrackerTest extends TelephonyTest { 
    @SmallTest

    public void testImsDeregistered() {

        // when IMS is deregistered

        mRegistrationCallback.onDeregistered(new ImsReasonInfo());

        mRegistrationCallback.onUnregistered(new ImsReasonInfo());

        // then service state should be OUT_OF_SERVICE and ImsPhone state set to not registered

        verify(mImsPhone).setServiceState(eq(ServiceState.STATE_OUT_OF_SERVICE));

        verify(mImsPhone).setImsRegistered(eq(false));