commit a90d59b4d726c54dfaca5fc3f9909473a8b5ce43
author Geoff Mendal <mendal@google.com> Wed Nov 12 21:58:11 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 12 21:58:11 2014 +0000
tree 671e7aed1bb253221ddb99ed1ed81bf2b9df5e0d
parent 36e3ada72c816a3802f43bc6116cbf1b7c24f18e
parent addfada961e706cd57cd63b9a3a113e0f206103b

Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

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 e3327c3..502d75b 100644
--- a/src/com/android/server/telecom/CallsManager.java
+++ b/src/com/android/server/telecom/CallsManager.java
@@ -847,7 +847,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);
                 }
             }
         }