commit e6ae3fde438e64ce9f7632824a8a7c51f8f93226
author Sailesh Nepal <sail@google.com> Fri Sep 26 00:56:09 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 26 00:56:10 2014 +0000
tree 5967511db7c11936bea14dc766c873a107c260e1
parent 663a52d68a4cd9aa0a9109bab8934459d05c7753
parent 95ea5765dca757c8c9f0445eba6735dac996c62b

Merge "Adding support for Cdma conference calling." into lmp-dev

telecomm/java/android/telecom/RemoteConference.java

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 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);