commit 2af16b65f88fcb84d15b701f8f112f7f5a443eaf
author Yorke Lee <yorkelee@google.com> Tue Nov 11 17:36:57 2014 -0800
committer Yorke Lee <yorkelee@google.com> Tue Nov 11 17:36:57 2014 -0800
tree 4dce35c159be52abc7ce564dc177be8fc7638004
parent d547a4b030c5e99023b8c3d7336c77f1f68686a9

Cleanup and remove call if ConnectionService crashes

Make sure that call is removed from CallsManager if its
ConnectionService crashes.

Verified fix with TestConnectionManager.

Bug: 18262469
Change-Id: Idae71186b6547cb5a4c89e273c779eef030a2952

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

diff --git a/src/com/android/server/telecom/CallsManager.java b/src/com/android/server/telecom/CallsManager.java
index 57b9e8e..79f0c42 100644
--- a/src/com/android/server/telecom/CallsManager.java
+++ b/src/com/android/server/telecom/CallsManager.java
@@ -845,7 +845,10 @@
         if (service != null) {
             for (Call call : mCalls) {
                 if (call.getConnectionService() == service) {
-                    markCallAsDisconnected(call, new DisconnectCause(DisconnectCause.ERROR));
+                    if (call.getState() != CallState.DISCONNECTED) {
+                        markCallAsDisconnected(call, new DisconnectCause(DisconnectCause.ERROR));
+                    }
+                    markCallAsRemoved(call);
                 }
             }
         }