commit 355083c47573360cc3e8aa6cdd4198a613640f74
author Santos Cordon <santoscordon@google.com> Fri May 23 14:09:32 2014 -0700
committer Jay Shrauner <shrauner@google.com> Wed May 28 04:44:47 2014 +0000
tree 980d5ae8f039e970e0f7826004b0bd1c5f0a3fd5
parent 682fe6ba2fe99e209d72a051539697a755b994c0

Marking call as DIALING from CallsManager instead of Call. DO NOT MERGE

Bug: 15190301

Change-Id: Ibfee6ce6b559dca5d900996c386c3d8daf4508f4
(cherry picked from commit 6cb7ba934c1eedc230ae08ddcd63b76299a330de)

src/com/android/telecomm/CallsManager.java

diff --git a/src/com/android/telecomm/CallsManager.java b/src/com/android/telecomm/CallsManager.java
index a4b2086..078209e 100644
--- a/src/com/android/telecomm/CallsManager.java
+++ b/src/com/android/telecomm/CallsManager.java
@@ -123,7 +123,12 @@
         } else if (mPendingHandoffCalls.contains(call)) {
             updateHandoffCallServiceDescriptor(call.getOriginalCall(),
                     call.getCallService().getDescriptor());
+        } else {
+            Log.wtf(this, "unexpected successful call notification: %s", call);
+            return;
         }
+
+        markCallAsDialing(call);
     }
 
     @Override
@@ -384,6 +389,8 @@
         tempCall.setExtras(originalCall.getExtras());
         tempCall.setCallServiceSelector(originalCall.getCallServiceSelector());
         mPendingHandoffCalls.add(tempCall);
+        tempCall.addListener(this);
+
         Log.d(this, "Placing handoff call");
         tempCall.startOutgoing();
     }
@@ -588,6 +595,7 @@
         // Remove the transient handoff call object (don't disconnect because the call could still
         // be live).
         mPendingHandoffCalls.remove(handoffCall);
+        handoffCall.removeListener(this);
 
         if (wasSuccessful) {
             // Disconnect.