commit f3d289afb189961f4b7f02938146f20776febde3
author Linux Build Service Account <lnxbuild@localhost> Thu Oct 20 04:37:59 2016 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Oct 20 04:37:59 2016 -0700
tree 111ec3f5095c4050503eb2bfca8512503cc10fd1
parent 7eba4ca9954a4e4e0438c09aa9bac909ca0e7b56
parent 25da2ca8f82692d7c9f41c29033af588a4f51abf

Merge "Fix display contact name in toast while responding call via sms" into atel.lnx.2.0-dev

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

diff --git a/src/com/android/server/telecom/ConnectionServiceWrapper.java b/src/com/android/server/telecom/ConnectionServiceWrapper.java
index bd01eb4..338d1c3 100644
--- a/src/com/android/server/telecom/ConnectionServiceWrapper.java
+++ b/src/com/android/server/telecom/ConnectionServiceWrapper.java
@@ -920,12 +920,12 @@
     }
 
     void removeCall(String callId, DisconnectCause disconnectCause) {
+        mCallIdMapper.removeCall(callId);
+
         CreateConnectionResponse response = mPendingResponses.remove(callId);
         if (response != null) {
             response.handleCreateConnectionFailure(disconnectCause);
         }
-
-        mCallIdMapper.removeCall(callId);
     }
 
     void removeCall(Call call, DisconnectCause disconnectCause) {