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

Commit ffa5d36d authored by Tyler Gunn's avatar Tyler Gunn Committed by android-build-merger
Browse files

Merge "IMS conference merge improvements." into oc-dev 

am: 9f4db346

Change-Id: Ie34eb191cbe1450a94dba2d31594fd58bcea2f13
parents d71b0883 9f4db346

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

+11 −1
Original line number Original line Diff line number Diff line
@@ -1189,6 +1189,13 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
        ImsPhoneConnection foregroundConnection = mForegroundCall.getFirstConnection();

        ImsPhoneConnection foregroundConnection = mForegroundCall.getFirstConnection();

        if (foregroundConnection != null) {

        if (foregroundConnection != null) {

            foregroundConnection.setConferenceConnectTime(conferenceConnectTime);

            foregroundConnection.setConferenceConnectTime(conferenceConnectTime);

            foregroundConnection.onConnectionEvent(android.telecom.Connection.EVENT_MERGE_START,

                    null);

        }

        ImsPhoneConnection backgroundConnection = findConnection(bgImsCall);

        if (backgroundConnection != null) {

            backgroundConnection.onConnectionEvent(android.telecom.Connection.EVENT_MERGE_START,

                    null);

        }

        }





        try {

        try {
@@ -1720,9 +1727,11 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
                return DisconnectCause.BUSY;

                return DisconnectCause.BUSY;





            case ImsReasonInfo.CODE_USER_TERMINATED:

            case ImsReasonInfo.CODE_USER_TERMINATED:

            case ImsReasonInfo.CODE_LOCAL_ENDED_BY_CONFERENCE_MERGE:

                return DisconnectCause.LOCAL;

                return DisconnectCause.LOCAL;





            case ImsReasonInfo.CODE_LOCAL_ENDED_BY_CONFERENCE_MERGE:

                return DisconnectCause.IMS_MERGED_SUCCESSFULLY;



            case ImsReasonInfo.CODE_LOCAL_CALL_DECLINE:

            case ImsReasonInfo.CODE_LOCAL_CALL_DECLINE:

            case ImsReasonInfo.CODE_REMOTE_CALL_DECLINE:

            case ImsReasonInfo.CODE_REMOTE_CALL_DECLINE:

                // If the call has been declined locally (on this device), or on remotely (on

                // If the call has been declined locally (on this device), or on remotely (on
@@ -2293,6 +2302,7 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
            ImsPhoneConnection conn = findConnection(call);

            ImsPhoneConnection conn = findConnection(call);

            if (conn != null) {

            if (conn != null) {

                conn.onConferenceMergeFailed();

                conn.onConferenceMergeFailed();

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

            }

            }

        }

        }