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

Commit 381e290b authored by Tyler Gunn's avatar Tyler Gunn
Browse files

Merge "Notify both background call and foreground call about merge failure"...

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

Change-Id: I2813e8d5770a62d07a731f70e433256026ccd67b
parents 879449a9 467c55d8
Loading
Loading
Loading
Loading
+10 −4
Original line number Diff line number Diff line
@@ -3211,10 +3211,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();
            }
        }