commit 208cb8de2f8fad5c1d3797bf38e0879bb0996670
author Brad Ebinger <breadley@google.com> Wed May 04 22:20:36 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 04 22:20:36 2016 +0000
tree cb55b541b95c6e3d9e98965e5c594fa79aab4213
parent bd285fe82999e8c37eb231d20871199e53210d44
parent baeabcf139c95c1b9c4446d3b46497837dee9744

Merge "Add a check to see if a call has been disconnected" into nyc-dev

src/com/android/phone/PhoneUtils.java

diff --git a/src/com/android/phone/PhoneUtils.java b/src/com/android/phone/PhoneUtils.java
index 361c925..4dd7d0b 100644
--- a/src/com/android/phone/PhoneUtils.java
+++ b/src/com/android/phone/PhoneUtils.java
@@ -1853,10 +1853,14 @@
     }
 
     static boolean isInEmergencyCall(CallManager cm) {
-        for (Connection cn : cm.getActiveFgCall().getConnections()) {
-            if (PhoneNumberUtils.isLocalEmergencyNumber(PhoneGlobals.getInstance(),
-                    cn.getAddress())) {
-                return true;
+        Call fgCall = cm.getActiveFgCall();
+        // isIdle includes checks for the DISCONNECTING/DISCONNECTED state.
+        if(!fgCall.isIdle()) {
+            for (Connection cn : fgCall.getConnections()) {
+                if (PhoneNumberUtils.isLocalEmergencyNumber(PhoneGlobals.getInstance(),
+                        cn.getAddress())) {
+                    return true;
+                }
             }
         }
         return false;