diff options
author | mike dooley <mdooley@google.com> | 2014-09-25 14:49:21 -0700 |
---|---|---|
committer | mike dooley <mdooley@google.com> | 2014-09-25 15:09:02 -0700 |
commit | 95ea5765dca757c8c9f0445eba6735dac996c62b (patch) | |
tree | 9a48b44f1fbb633717274989f43626862f4b3447 /telecomm | |
parent | 91807556a812d6c46c654869fc699c454eb657d1 (diff) | |
download | frameworks_base-95ea5765dca757c8c9f0445eba6735dac996c62b.zip frameworks_base-95ea5765dca757c8c9f0445eba6735dac996c62b.tar.gz frameworks_base-95ea5765dca757c8c9f0445eba6735dac996c62b.tar.bz2 |
Adding support for Cdma conference calling.
Adding methods to merge and swap Cdma conference
calls from hangouts.
Bug: 17658943
Change-Id: I0ce472415e3455503223fc0dab5e1a8ee415cde9
Diffstat (limited to 'telecomm')
-rw-r--r-- | telecomm/java/android/telecom/RemoteConference.java | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/telecomm/java/android/telecom/RemoteConference.java b/telecomm/java/android/telecom/RemoteConference.java index 796725b..b18cb96 100644 --- a/telecomm/java/android/telecom/RemoteConference.java +++ b/telecomm/java/android/telecom/RemoteConference.java @@ -166,6 +166,20 @@ public final class RemoteConference { } } + public void merge() { + try { + mConnectionService.mergeConference(mId); + } catch (RemoteException e) { + } + } + + public void swap() { + try { + mConnectionService.swapConference(mId); + } catch (RemoteException e) { + } + } + public void hold() { try { mConnectionService.hold(mId); |