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

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

Merge "Notify both background call and foreground call about merge failure" am: 03ad9306

Change-Id: I85ff667e5450f40fbf4a48e6a3b2c79b7eb134bc
parents 124d48dd 03ad9306
Loading
Loading
Loading
Loading
+10 −4
Original line number Diff line number Diff line
@@ -3176,10 +3176,16 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall {

            // Start plumbing this even through Telecom so other components can take
            // appropriate action.
            ImsPhoneConnection conn = findConnection(call);
            if (conn != null) {
                conn.onConferenceMergeFailed();
                conn.handleMergeComplete();
            ImsPhoneConnection foregroundConnection = mForegroundCall.getFirstConnection();
            if (foregroundConnection != null) {
                foregroundConnection.onConferenceMergeFailed();
                foregroundConnection.handleMergeComplete();
            }

            ImsPhoneConnection backgroundConnection = mBackgroundCall.getFirstConnection();
            if (backgroundConnection != null) {
                backgroundConnection.onConferenceMergeFailed();
                backgroundConnection.handleMergeComplete();
            }
        }