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

1 files changed, 1 insertions, 1 deletions

diff --git a/src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java b/src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java
index 48ffcf9ee..a0213ef7e 100644
--- a/src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java
+++ b/src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java
@@ -1416,7 +1416,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();
             }