commit 947c1922e7796ce04c508314b346dded8b36efa3
author Tyler Gunn <tgunn@google.com> Thu Aug 28 04:39:50 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 28 04:39:50 2014 +0000
tree f532710e5d26007fda7f66af51ffb842b2173ccd
parent c4374a43d6bd8940af9890e2121e6571da07910f
parent 1711aec69264a36fda29c825bc6fb8fbceeb1efd

Merge "Support CDMA emergency callback. (2/2)" 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 2e7bc45..d2d4e9e 100644
--- a/src/com/android/telecomm/InCallController.java
+++ b/src/com/android/telecomm/InCallController.java
@@ -425,8 +425,10 @@
         if (CallsManager.getInstance().isAddCallCapable(call)) {
             capabilities |= PhoneCapabilities.ADD_CALL;
         }
-        if (!call.isEmergencyCall()) {
-            capabilities |= PhoneCapabilities.MUTE;
+
+        // Disable mute for emergency calls.
+        if (call.isEmergencyCall()) {
+            capabilities &= ~PhoneCapabilities.MUTE;
         }
 
         int state = call.getState();