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

Commit 78f4cbd8 authored by Tyler Gunn's avatar Tyler Gunn
Browse files

Signal EVENT_MERGE_COMPLETE connection event on merge completion. 

This was previously only sent on merge failure.
We now trigger the merge complete event once all the connections have been
merged (or failed to merge) into the conference.

Test: Manual conference test, verified signal ordering in Telecom logs.
Test: Add unit tests
Bug: 139169804
Merged-In: Ic3b6b0350b4e6a321d175e001df2f786a2317e60
Change-Id: Ic3b6b0350b4e6a321d175e001df2f786a2317e60
(cherry picked from commit e3de76f3)
parent 12209ab7

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

+6 −1
Original line number Diff line number Diff line
@@ -2732,8 +2732,8 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
            }

            foregroundImsPhoneCall.merge(peerImsPhoneCall, ImsPhoneCall.State.ACTIVE);



            try {

            final ImsPhoneConnection conn = findConnection(call);

            try {

                log("onCallMerged: ImsPhoneConnection=" + conn);

                log("onCallMerged: CurrentVideoProvider=" + conn.getVideoProvider());

                setVideoCallProvider(conn, call);
@@ -2761,6 +2761,11 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
                // Reset the flag.

                call.resetIsMergeRequestedByConf(false);

            }



            // Notify completion of merge

            if (conn != null) {

                conn.handleMergeComplete();

            }

            logState();

        }

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

+19 −1
Original line number Diff line number Diff line
@@ -943,6 +943,23 @@ public class ImsPhoneCallTrackerTest extends TelephonyTest { 
        Assert.fail("Expected CallStateException");

    }



    @Test

    @SmallTest

    public void testMergeComplete() {

        boolean[] result = new boolean[1];

        // Place a call.

        ImsPhoneConnection connection = placeCallAndMakeActive();

        connection.addListener(new Connection.ListenerBase() {

            @Override

            public void onConnectionEvent(String event, Bundle extras) {

                result[0] = android.telecom.Connection.EVENT_MERGE_COMPLETE.equals(event);

            }

        });

        ImsCall call = connection.getImsCall();

        call.getListener().onCallMerged(call, null, false);

        assertTrue(result[0]);

    }



    @Test

    @SmallTest

    public void testNumericOnlyRemap() {
@@ -984,7 +1001,7 @@ public class ImsPhoneCallTrackerTest extends TelephonyTest { 
                                "SERVICE not allowed in this location")));

    }



    private void placeCallAndMakeActive() {

    private ImsPhoneConnection placeCallAndMakeActive() {

        try {

            doAnswer(new Answer<ImsCall>() {

                @Override
@@ -1017,6 +1034,7 @@ public class ImsPhoneCallTrackerTest extends TelephonyTest { 
                new ImsStreamMediaProfile());

        imsCall.getImsCallSessionListenerProxy().callSessionStarted(imsCall.getSession(),

                new ImsCallProfile());

        return connection;

    }

}