From 95ea5765dca757c8c9f0445eba6735dac996c62b Mon Sep 17 00:00:00 2001
From: mike dooley <mdooley@google.com>
Date: Thu, 25 Sep 2014 14:49:21 -0700
Subject: Adding support for Cdma conference calling.

Adding methods to merge and swap Cdma conference
calls from hangouts.

Bug: 17658943
Change-Id: I0ce472415e3455503223fc0dab5e1a8ee415cde9
---
 telecomm/java/android/telecom/RemoteConference.java | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'telecomm')

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);
-- 
cgit v1.1