diff options
| author | Santos Cordon <santoscordon@google.com> | 2014-06-06 09:08:46 -0700 |
|---|---|---|
| committer | Santos Cordon <santoscordon@google.com> | 2014-06-09 10:58:21 -0700 |
| commit | 62e699d1b0b9a8606014ace43b84eccf614b6867 (patch) | |
| tree | 8cebd613d64181e5aa3bc7bc99add3b6d3ebd595 /InCallUI/src/com/android/incallui/TelecommAdapter.java | |
| parent | 561374c01312e1d2daa526a38f66f28c822573e5 (diff) | |
Support conference calling. (4/4) [DO NOT MERGE]
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 1828678f4..f1dd50b80 100644 --- a/InCallUI/src/com/android/incallui/TelecommAdapter.java +++ b/InCallUI/src/com/android/incallui/TelecommAdapter.java @@ -99,11 +99,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() { |