commit 10838c23aa209b364812cf1dcc23a3793234fb0d
author Santos Cordon <santoscordon@google.com> Wed Jun 11 17:36:04 2014 -0700
committer Santos Cordon <santoscordon@google.com> Wed Jun 11 17:49:18 2014 -0700
tree 657aa4cb5f19f98c6d3c8a6e8e1ffb6f7a8966d0
parent 6a405e029d78938c54391a562d44ccbc339f81fb

Support Add Call (1/2)

Bug: 15006702
Change-Id: I5b99af2da0841897ab87f8b9076f4fae91233b80

src/com/android/telecomm/InCallController.java

diff --git a/src/com/android/telecomm/InCallController.java b/src/com/android/telecomm/InCallController.java
index 7be1baa..6dac2ce 100644
--- a/src/com/android/telecomm/InCallController.java
+++ b/src/com/android/telecomm/InCallController.java
@@ -277,6 +277,9 @@
         if (call.isConferenceCapable()) {
             capabilities |= CallCapabilities.MERGE_CALLS;
         }
+        if (CallsManager.getInstance().isAddCallCapable(call)) {
+            capabilities |= CallCapabilities.ADD_CALL;
+        }
         CallState state = call.getState();
         if (state == CallState.ABORTED) {
             state = CallState.DISCONNECTED;
@@ -307,4 +310,5 @@
                 capabilities, connectTimeMillis, call.getHandle(), call.getGatewayInfo(),
                 descriptor, call.getHandoffCallServiceDescriptor(), parentCallId, childCallIds);
     }
+
 }