commit 81c06342f8f6b3bbd891d2f630641671a4f2c7ce
author Santos Cordon <santoscordon@google.com> Fri Sep 05 23:46:17 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 05 23:46:17 2014 +0000
tree d65da2a7fddaf38e141142dc289b8f223ee1749b
parent a91bc41142a1dcfe0329e65aa763fb44d59c1630
parent 6805923a2d91f9e193a4dd33f7a655587d2f173c

Merge "Add CDMA conference call capabilities" into lmp-dev

src/com/android/telecomm/InCallController.java

diff --git a/src/com/android/telecomm/InCallController.java b/src/com/android/telecomm/InCallController.java
index f132934..9a34311 100644
--- a/src/com/android/telecomm/InCallController.java
+++ b/src/com/android/telecomm/InCallController.java
@@ -423,9 +423,10 @@
             capabilities |= PhoneCapabilities.ADD_CALL;
         }
 
-        // Disable mute for emergency calls.
+        // Disable mute and add call for emergency calls.
         if (call.isEmergencyCall()) {
             capabilities &= ~PhoneCapabilities.MUTE;
+            capabilities &= ~PhoneCapabilities.ADD_CALL;
         }
 
         int properties = call.isConference() ? CallProperties.CONFERENCE : 0;