Commit 3db37b5a authored Dec 01, 2015 by Shriram Ganesh Committed by Steve Kondik May 20, 2016

Fix disabled merge button on conference failure.

The notification for the conference failure is not notified on the
foreground call. As a result in a scenario of foreground single
party call and background conference call merge, the notifications
do not go out on the foreground call. This is because of internal
logic of merge peer and merge host that are maintained during
conference scenarios that makes the host as conference call.

Change-Id: Ia910c1b00e3b4a232153c5b3873a4ec708830f66
CRs-Fixed: 931958

parent 99e4576c

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -1458,7 +1458,7 @@ public final class ImsPhoneCallTracker extends CallTracker {

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