commit 4b034a6b5901291fe06db397d394c484e68d7781
author Santos Cordon <santoscordon@google.com> Fri Jul 18 13:42:05 2014 -0700
committer Santos Cordon <santoscordon@google.com> Fri Jul 18 13:46:54 2014 -0700
tree 8c7aec5c90c58fac58df26a9bf354c94f9c3d07b
parent 0a388fc566576513f54610c4427fb30feb88ab02

Fixing ADD_CALL (2/3)

Bug: 16241726
Change-Id: Ie1dd72a79c2430b10b0239dbdda5508edbc8eb26

src/com/android/telecomm/InCallController.java

diff --git a/src/com/android/telecomm/InCallController.java b/src/com/android/telecomm/InCallController.java
index 7081dc9..8e973f6 100644
--- a/src/com/android/telecomm/InCallController.java
+++ b/src/com/android/telecomm/InCallController.java
@@ -281,11 +281,11 @@
         String callId = mCallIdMapper.getCallId(call);
 
         int capabilities = call.getCallCapabilities();
-        if (!CallsManager.getInstance().isAddCallCapable(call)) {
-            capabilities &= ~CallCapabilities.ADD_CALL;
+        if (CallsManager.getInstance().isAddCallCapable(call)) {
+            capabilities |= CallCapabilities.ADD_CALL;
         }
-        if (call.isEmergencyCall()) {
-            capabilities &= ~CallCapabilities.MUTE;
+        if (!call.isEmergencyCall()) {
+            capabilities |= CallCapabilities.MUTE;
         }
 
         CallState state = call.getState();