commit 049b7b6a8d0cf44d687d827cb57a18fa23358206
author Santos Cordon <santoscordon@google.com> Thu Jan 30 05:34:26 2014 -0800
committer Santos Cordon <santoscordon@google.com> Fri Feb 07 15:38:21 2014 -0800
tree ee2ebe4bd7c57fea4ba9b4376f7650fae236d625
parent 681663d17b6d92b604526a54b196fa88f25b6957

Fully connect CallsManager with InCallController for outgoing calls.

Change-Id: Ic28fc5ea1e4a76be32fc7bd2d29f9690da959c96

src/com/android/telecomm/CallsManager.java

diff --git a/src/com/android/telecomm/CallsManager.java b/src/com/android/telecomm/CallsManager.java
index 332eb0a..2a621aa 100644
--- a/src/com/android/telecomm/CallsManager.java
+++ b/src/com/android/telecomm/CallsManager.java
@@ -117,7 +117,23 @@
         Preconditions.checkState(call.getState() == CallState.DIALING);
 
         addCall(call);
-        // TODO(santoscordon): Notify in-call UI.
+
+        mInCallController.addCall(call.toCallInfo());
+    }
+
+    /*
+     * Sends all the live calls to the in-call app if any exist. If there are no live calls, then
+     * tells the in-call controller to unbind since it is not needed.
+     */
+    void updateInCall() {
+        if (mCalls.isEmpty()) {
+            mInCallController.unbind();
+            return;
+        }
+
+        for (Call call : mCalls.values()) {
+            mInCallController.addCall(call.toCallInfo());
+        }
     }
 
     /**
@@ -150,7 +166,13 @@
      * @param callId The ID of the call.
      */
     void disconnectCall(String callId) {
-        // TODO(santoscordon): fill in and check that the call is in the active state.
+        Call call = mCalls.get(callId);
+        if (call == null) {
+            Log.e(TAG, "Unknown call (" + callId + ") asked to disconnect");
+        } else {
+            call.disconnect();
+        }
+
     }
 
     void markCallAsRinging(String callId) {
@@ -165,9 +187,21 @@
         setCallState(callId, CallState.ACTIVE);
     }
 
+    /**
+     * Marks the specified call as DISCONNECTED and notifies the in-call app. If this was the last
+     * live call, then also disconnect from the in-call controller.
+     *
+     * @param callId The ID of the call.
+     */
     void markCallAsDisconnected(String callId) {
         setCallState(callId, CallState.DISCONNECTED);
         mCalls.remove(callId);
+
+        // Notify the in-call UI
+        mInCallController.markCallAsDisconnected(callId);
+        if (mCalls.isEmpty()) {
+            mInCallController.unbind();
+        }
     }
 
     /**