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

Commit c3cda062 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Ensure MERGE_COMPLETE connection event propagates for IMS conferences." into udc-dev

parents 7f59b0cf bd273e5a

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

+6 −0
Original line number Diff line number Diff line
@@ -3700,6 +3700,12 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
                cause = DisconnectCause.IMS_MERGED_SUCCESSFULLY;

            }



            // Ensure the background call is correctly marked as MERGE_COMPLETE before it is

            // disconnected as part of the IMS merge conference process:

            if (cause == DisconnectCause.IMS_MERGED_SUCCESSFULLY && conn != null) {

                conn.onConnectionEvent(android.telecom.Connection.EVENT_MERGE_COMPLETE, null);

            }



            EmergencyNumberTracker emergencyNumberTracker = null;

            EmergencyNumber num = null;

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

+0 −1
Original line number Diff line number Diff line
@@ -1593,7 +1593,6 @@ public class ImsPhoneConnection extends Connection implements 
     */

    public void handleMergeComplete() {

        mIsMergeInProcess = false;

        onConnectionEvent(android.telecom.Connection.EVENT_MERGE_COMPLETE, null);

    }



    /**

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

+3 −1
Original line number Diff line number Diff line
@@ -1666,7 +1666,9 @@ public class ImsPhoneCallTrackerTest extends TelephonyTest { 
            }

        });

        ImsCall call = connection.getImsCall();

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

        call.getListener().onCallTerminated(

                call, new ImsReasonInfo(

                        ImsReasonInfo.CODE_LOCAL_ENDED_BY_CONFERENCE_MERGE, 0));

        assertTrue(result[0]);

    }