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

Commit aa7fb4b7 authored by Tyler Gunn's avatar Tyler Gunn
Browse files

Fix termination of local ringback on SRVCC. 

The previous code fix was doing it on handover from VOWIFI to LTE, which
is not correct.
This change ensures it happens only on actual SRVCC complete.

Bug: 157020264
Bug: 156863251
Test: Added new unit test to verify ringback ceases on SRVCC.
Change-Id: I69c33e3de1e51e616637ff5c9412429b66221983
parent ad44b780

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

+4 −0
Original line number Diff line number Diff line
@@ -397,6 +397,10 @@ public class ImsPhoneCall extends Call { 
        }

    }



    public boolean isRingbackTonePlaying() {

        return mIsRingbackTonePlaying;

    }



    private void takeOver(ImsPhoneCall that) {

        copyConnectionFrom(that);

        mState = that.mState;

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

+4 −6
Original line number Diff line number Diff line
@@ -3357,12 +3357,6 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 


            ImsPhoneConnection conn = findConnection(imsCall);

            if (conn != null) {

                ImsPhoneCall imsPhoneCall = conn.getCall();

                if (imsPhoneCall != null) {

                    // We might be playing ringback on the handover connection; we should stop

                    // playing it at this point (otherwise it could play indefinitely).

                    imsPhoneCall.maybeStopRingback();

                }

                if (conn.getDisconnectCause() == DisconnectCause.NOT_DISCONNECTED) {

                    if (isHandoverToWifi) {

                        removeMessages(EVENT_CHECK_FOR_WIFI_HANDOVER);
@@ -3769,6 +3763,10 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
        mSrvccState = state;



        if (mSrvccState == Call.SrvccState.COMPLETED) {

            // If the dialing call had ringback, ensure it stops now, otherwise it'll keep playing

            // afer the SRVCC completes.

            mForegroundCall.maybeStopRingback();



            resetState();

            transferHandoverConnections(mForegroundCall);

            transferHandoverConnections(mBackgroundCall);

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

+18 −0
Original line number Diff line number Diff line
@@ -1107,6 +1107,24 @@ public class ImsPhoneCallTrackerTest extends TelephonyTest { 
        assertVtDataUsageUpdated(13, 19, 19);

    }



    @Test

    @SmallTest

    public void testEndRingbackOnSrvcc() throws RemoteException {

        mSecondImsCall.getCallProfile().mMediaProfile = new ImsStreamMediaProfile();

        mSecondImsCall.getCallProfile().mMediaProfile.mAudioDirection =

                ImsStreamMediaProfile.DIRECTION_INACTIVE;



        startOutgoingCall();

        mImsCallListener.onCallProgressing(mSecondImsCall);



        assertTrue(mCTUT.mForegroundCall.isRingbackTonePlaying());



        // Move the connection to the handover state.

        mCTUT.notifySrvccState(Call.SrvccState.COMPLETED);



        assertFalse(mCTUT.mForegroundCall.isRingbackTonePlaying());

    }



    @Test

    @SmallTest

    public void testHangupHandoverCall() throws RemoteException {