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

Commit 5377c779 authored by Tyler Gunn's avatar Tyler Gunn Committed by Automerger Merge Worker
Browse files

Merge "Update ImsPhoneCallTracker state on SRVCC complete." am: a978ff87 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1392020

Change-Id: I521ca9c3968bceb9e1c7871d3daf31da0c4f4ef2
parents e8be6d52 a978ff87

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

+1 −0
Original line number Diff line number Diff line
@@ -3791,6 +3791,7 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
            transferHandoverConnections(mForegroundCall);

            transferHandoverConnections(mBackgroundCall);

            transferHandoverConnections(mRingingCall);

            updatePhoneState();

        }

    }

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

+30 −0
Original line number Diff line number Diff line
@@ -1189,6 +1189,36 @@ public class ImsPhoneCallTrackerTest extends TelephonyTest { 
        assertEquals(DisconnectCause.LOCAL, connection.getDisconnectCause());

    }



    /**

     * Verifies that the {@link ImsPhoneCallTracker#getState()} goes to IDLE when an SRVCC takes

     * place.

     * @throws RemoteException

     */

    @Test

    @SmallTest

    public void testTrackerStateOnHandover() throws RemoteException {

        doReturn("1").when(mImsCallSession).getCallId();

        assertEquals(PhoneConstants.State.IDLE, mCTUT.getState());

        assertFalse(mCTUT.mRingingCall.isRinging());

        // mock a MT call

        mMmTelListener.onIncomingCall(mock(IImsCallSession.class), Bundle.EMPTY);

        verify(mImsPhone, times(1)).notifyNewRingingConnection((Connection) any());

        verify(mImsPhone, times(1)).notifyIncomingRing();

        assertEquals(PhoneConstants.State.RINGING, mCTUT.getState());

        assertTrue(mCTUT.mRingingCall.isRinging());

        assertEquals(1, mCTUT.mRingingCall.getConnections().size());

        ImsPhoneConnection connection =

                (ImsPhoneConnection) mCTUT.mRingingCall.getConnections().get(0);

        connection.addListener(mImsPhoneConnectionListener);



        // Move the connection to the handover state.

        mCTUT.notifySrvccState(Call.SrvccState.COMPLETED);

        assertEquals(1, mCTUT.mHandoverCall.getConnections().size());



        // Make sure the tracker states it's idle.

        assertEquals(PhoneConstants.State.IDLE, mCTUT.getState());

    }



    private void assertVtDataUsageUpdated(int expectedToken, long rxBytes, long txBytes)

            throws RemoteException {

        final ArgumentCaptor<NetworkStats> ifaceStatsCaptor = ArgumentCaptor.forClass(