commit 4527702619ef22da25dae00173675a4468a1314c
author Christine Chen <christinech@google.com> Thu Sep 05 10:55:37 2013 -0700
committer Christine Chen <christinech@google.com> Fri Sep 06 10:04:53 2013 -0700
tree 3c7ef9c897b1ca1cf0be0a288fd0d0074b41b849
parent 6952672d7c9a8a338729b995fe3d3c8fc210c90d

Adds separate conference call function.

- Also fixes bug on update conference call.

Bug: 10334739
Change-Id: I4f59c3cf12911b175173e76a1551eb0e3999ba3f

src/com/android/phone/CallCommandService.java

diff --git a/src/com/android/phone/CallCommandService.java b/src/com/android/phone/CallCommandService.java
index 72273ee..371ca7b 100644
--- a/src/com/android/phone/CallCommandService.java
+++ b/src/com/android/phone/CallCommandService.java
@@ -105,9 +105,10 @@
                 int state = result.getCall().getState();
                 if (Call.State.ACTIVE == state ||
                         Call.State.ONHOLD == state ||
-                        Call.State.DIALING == state ||
-                        Call.State.CONFERENCED == state) {
+                        Call.State.DIALING == state) {
                     result.getConnection().getCall().hangup();
+                } else if (Call.State.CONFERENCED == state) {
+                    result.getConnection().hangup();
                 }
             }
         } catch (Exception e) {
@@ -116,6 +117,23 @@
     }
 
     @Override
+    public void separateCall(int callId) {
+        try {
+            CallResult result = mCallModeler.getCallWithId(callId);
+            if (DBG) Log.d(TAG, "disconnectCall " + result.getCall());
+
+            if (result != null) {
+                int state = result.getCall().getState();
+                if (Call.State.CONFERENCED == state) {
+                    result.getConnection().separate();
+                }
+            }
+        } catch (Exception e) {
+            Log.e(TAG, "Error trying to separate call.", e);
+        }
+    }
+
+    @Override
     public void hold(int callId, boolean hold) {
         try {
             CallResult result = mCallModeler.getCallWithId(callId);