commit adee12dd6b3e85ce3ae419329226c9aa72c184fc
author Yorke Lee <yorkelee@google.com> Thu Mar 13 12:08:30 2014 -0700
committer Yorke Lee <yorkelee@google.com> Thu Mar 13 14:38:02 2014 -0700
tree 0f981404257431524d5288a6b330d33b4e94fac9
parent 3c6f27e2b61d7f5d074e525f78120591e18d6fb0

Fix crash when making an outgoing call

Fix the Log.wtf exception that occurs because mPendingOutgoingCallIds
does not contain the expected callId

Change-Id: I5cf6b08a2bffd883b89791d3cca9d5fc6b2175f6

src/com/android/telecomm/Call.java

diff --git a/src/com/android/telecomm/Call.java b/src/com/android/telecomm/Call.java
index 6660dc3..0b60c4a 100644
--- a/src/com/android/telecomm/Call.java
+++ b/src/com/android/telecomm/Call.java
@@ -155,10 +155,7 @@
     void setCallService(CallServiceWrapper callService) {
         Preconditions.checkNotNull(callService);
 
-        if (mCallService != null) {
-            // Should never be the case, basically covering for potential programming errors.
-            decrementAssociatedCallCount(mCallService);
-        }
+        clearCallService();
 
         callService.incrementAssociatedCallCount();
         mCallService = callService;
@@ -168,8 +165,11 @@
      * Clears the associated call service.
      */
     void clearCallService() {
-        decrementAssociatedCallCount(mCallService);
-        mCallService = null;
+        if (mCallService != null) {
+            decrementAssociatedCallCount(mCallService);
+            mCallService.cancelOutgoingCall(getId());
+            mCallService = null;
+        }
     }
 
     void setCallServiceSelector(ICallServiceSelector selector) {