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

Commit 0c883457 authored by Brad Ebinger's avatar Brad Ebinger
Browse files

Fix ImsMmTelManager API in accordance with the council 

Bug: 121190195
Test: atest FrameworksTelephonyTests
Merged-In: Ic5d0e0b4aad9c7eadaec4b80b0d907c40882f825
Change-Id: Ic5d0e0b4aad9c7eadaec4b80b0d907c40882f825
parent 677a64a9

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