commit de5875e6bb3bc280a7d31616ca504fb9a4db54db
author Linux Build Service Account <lnxbuild@localhost> Fri May 26 00:56:16 2017 -0600
committer Linux Build Service Account <lnxbuild@localhost> Fri May 26 00:56:16 2017 -0600
tree 75f8d8ca77bd44811a47af8b126b3f01525c2059
parent 43731d8f69c9ce49133d091f03b2cf8d72afc078
parent eb00c745c218c5097540ddb56b4f700e0b3a962a

Merge eb00c745c218c5097540ddb56b4f700e0b3a962a on remote branch

Change-Id: I4bee9fa229b75ed5ed35ec017fc2bb9642035fbc

src/com/android/server/telecom/CallAudioManager.java

diff --git a/src/com/android/server/telecom/CallAudioManager.java b/src/com/android/server/telecom/CallAudioManager.java
index 478d8c6..7f54529 100644
--- a/src/com/android/server/telecom/CallAudioManager.java
+++ b/src/com/android/server/telecom/CallAudioManager.java
@@ -333,7 +333,10 @@
         } else {
             // The call joined a conference, so stop tracking it.
             if (mCallStateToCalls.get(call.getState()) != null) {
-                mCallStateToCalls.get(call.getState()).remove(call);
+                boolean isRemoveCallSuccess = mCallStateToCalls.get(call.getState()).remove(call);
+                if (!isRemoveCallSuccess) {
+                    mActiveDialingOrConnectingCalls.remove(call);
+                }
             }
 
             updateForegroundCall();