From 9ce7c408548d5240d124b5b4960233b13d17a635 Mon Sep 17 00:00:00 2001 From: Santos Cordon 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/TelecommAdapter.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'InCallUI/src/com/android/incallui/TelecommAdapter.java') diff --git a/InCallUI/src/com/android/incallui/TelecommAdapter.java b/InCallUI/src/com/android/incallui/TelecommAdapter.java index 90b9d96b0..4b0aff3cb 100644 --- a/InCallUI/src/com/android/incallui/TelecommAdapter.java +++ b/InCallUI/src/com/android/incallui/TelecommAdapter.java @@ -109,11 +109,19 @@ final class TelecommAdapter { } void separateCall(String callId) { - Log.wtf(this, "separateCall not implemented"); + if (mAdapter != null) { + mAdapter.splitFromConference(callId); + } else { + Log.e(this, "error separateCall, mAdapter is null."); + } } - void merge() { - Log.wtf(this, "merge not implemented"); + void merge(String callId) { + if (mAdapter != null) { + mAdapter.conference(callId); + } else { + Log.e(this, "error merge, mAdapter is null."); + } } void swap() { -- cgit v1.2.3