diff options
| author | Sailesh Nepal <sail@google.com> | 2014-09-26 04:40:34 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-26 04:40:34 +0000 |
| commit | faed92cdd21856b022f909ceb7a0c967a7b6477d (patch) | |
| tree | 991dcb61798fc769348f956dd2996cb8e22d2bd3 /telecomm | |
| parent | d9aa906e211d3df3a31c1d2b8c663344d38adf35 (diff) | |
| parent | 9bcda324758a8ebbf8064263b7d784031934e7b2 (diff) | |
| download | frameworks_base-faed92cdd21856b022f909ceb7a0c967a7b6477d.zip frameworks_base-faed92cdd21856b022f909ceb7a0c967a7b6477d.tar.gz frameworks_base-faed92cdd21856b022f909ceb7a0c967a7b6477d.tar.bz2 | |
am 5926650d: am 7461b5a0: Merge "Adding support for Cdma conference calling." into lmp-dev
* commit '5926650d6099469981369cf5235da6d2b135ba0d':
Adding support for Cdma conference calling.
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 f931bc5..f5e0732 100644 --- a/telecomm/java/android/telecom/RemoteConference.java +++ b/telecomm/java/android/telecom/RemoteConference.java @@ -163,6 +163,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); |