diff options
| author | Santos Cordon <santoscordon@google.com> | 2014-06-06 09:08:46 -0700 |
|---|---|---|
| committer | Santos Cordon <santoscordon@google.com> | 2014-06-12 16:14:40 -0700 |
| commit | 9ce7c408548d5240d124b5b4960233b13d17a635 (patch) | |
| tree | 311db22d26ee11f4c722c3d373add6b595e46ec0 /InCallUI/src/com/android/incallui/InCallPresenter.java | |
| parent | eeea8461a6ad29ad245054fe05733e1257dd4657 (diff) | |
Support conference calling. (4/4)
Bug: 15006702
Change-Id: I2764ea242f783ba478c9eae86618dd33e9fc792a
Diffstat (limited to 'InCallUI/src/com/android/incallui/InCallPresenter.java')
| -rw-r--r-- | InCallUI/src/com/android/incallui/InCallPresenter.java | 2 |
1 files changed, 1 insertions, 1 deletions
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(); |