From 9ce7c408548d5240d124b5b4960233b13d17a635 Mon Sep 17 00:00:00 2001
From: Santos Cordon <santoscordon@google.com>
Date: Fri, 6 Jun 2014 09:08:46 -0700
Subject: Support conference calling. (4/4)

Bug: 15006702
Change-Id: I2764ea242f783ba478c9eae86618dd33e9fc792a
---
 InCallUI/src/com/android/incallui/InCallPresenter.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'InCallUI/src/com/android/incallui/InCallPresenter.java')

diff --git a/InCallUI/src/com/android/incallui/InCallPresenter.java b/InCallUI/src/com/android/incallui/InCallPresenter.java
index 14c2a8020..922c29819 100644
--- a/InCallUI/src/com/android/incallui/InCallPresenter.java
+++ b/InCallUI/src/com/android/incallui/InCallPresenter.java
@@ -501,7 +501,7 @@ public class InCallPresenter implements CallList.Listener {
             // (2) Attempt actions on Generic conference calls
             if (activeCall.isConferenceCall() && isGeneric) {
                 if (canMerge) {
-                    TelecommAdapter.getInstance().merge();
+                    TelecommAdapter.getInstance().merge(activeCall.getCallId());
                     return true;
                 } else if (canSwap) {
                     TelecommAdapter.getInstance().swap();
-- 
cgit v1.2.3