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/TelecommAdapter.java | |
parent | eeea8461a6ad29ad245054fe05733e1257dd4657 (diff) |
Support conference calling. (4/4)
Bug: 15006702
Change-Id: I2764ea242f783ba478c9eae86618dd33e9fc792a
Diffstat (limited to 'InCallUI/src/com/android/incallui/TelecommAdapter.java')
-rw-r--r-- | InCallUI/src/com/android/incallui/TelecommAdapter.java | 14 |
1 files changed, 11 insertions, 3 deletions
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() { |