commit 9646ed98b4283a475862fca3df880524bedc9c1e
author Tyler Gunn <tgunn@google.com> Tue Aug 12 22:38:48 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 12 21:01:30 2014 +0000
tree 6f8aaf19097e7e4e2c973cdb1eb7681e96ab651a
parent b3ed36dbc6647e3b73c97e1846d6361c00784da0
parent cde2e5062b1b1689cd8962e28763fa0a35e2476a

Merge "Changing the point where the call state is set." into lmp-dev

src/com/android/telecomm/Call.java

diff --git a/src/com/android/telecomm/Call.java b/src/com/android/telecomm/Call.java
index 82827ad..6cfaeda 100644
--- a/src/com/android/telecomm/Call.java
+++ b/src/com/android/telecomm/Call.java
@@ -65,7 +65,7 @@
      * Listener for events on the call.
      */
     interface Listener {
-        void onSuccessfulOutgoingCall(Call call);
+        void onSuccessfulOutgoingCall(Call call, CallState callState);
         void onFailedOutgoingCall(Call call, int errorCode, String errorMsg);
         void onCancelledOutgoingCall(Call call);
         void onSuccessfulIncomingCall(Call call);
@@ -94,7 +94,7 @@
 
     abstract static class ListenerBase implements Listener {
         @Override
-        public void onSuccessfulOutgoingCall(Call call) {}
+        public void onSuccessfulOutgoingCall(Call call, CallState callState) {}
         @Override
         public void onFailedOutgoingCall(Call call, int errorCode, String errorMsg) {}
         @Override
@@ -623,7 +623,6 @@
             ConnectionRequest request, ParcelableConnection connection) {
         Log.v(this, "handleCreateConnectionSuccessful %s", connection);
         mCreateConnectionProcessor = null;
-        setState(getStateFromConnectionState(connection.getState()));
         setTargetPhoneAccount(connection.getPhoneAccount());
         setHandle(connection.getHandle(), connection.getHandlePresentation());
         setCallerDisplayName(
@@ -644,7 +643,8 @@
             mHandler.postDelayed(mDirectToVoicemailRunnable, Timeouts.getDirectToVoicemailMillis());
         } else {
             for (Listener l : mListeners) {
-                l.onSuccessfulOutgoingCall(this);
+                l.onSuccessfulOutgoingCall(this,
+                        getStateFromConnectionState(connection.getState()));
             }
         }
     }
@@ -676,7 +676,6 @@
         if (mIsIncoming) {
             clearConnectionService();
             setDisconnectCause(DisconnectCause.OUTGOING_CANCELED, null);
-            setState(CallState.DISCONNECTED);
 
             Listener[] listeners = mListeners.toArray(new Listener[mListeners.size()]);
             for (int i = 0; i < listeners.length; i++) {

src/com/android/telecomm/CallsManager.java

diff --git a/src/com/android/telecomm/CallsManager.java b/src/com/android/telecomm/CallsManager.java
index b7cc233..d9d3ef9 100644
--- a/src/com/android/telecomm/CallsManager.java
+++ b/src/com/android/telecomm/CallsManager.java
@@ -123,8 +123,9 @@
     }
 
     @Override
-    public void onSuccessfulOutgoingCall(Call call) {
+    public void onSuccessfulOutgoingCall(Call call, CallState callState) {
         Log.v(this, "onSuccessfulOutgoingCall, %s", call);
+        setCallState(call, callState);
         if (mCalls.contains(call)) {
             // The call's ConnectionService has been updated.
             for (CallsManagerListener listener : mListeners) {
@@ -161,6 +162,7 @@
 
     @Override
     public void onFailedIncomingCall(Call call) {
+        setCallState(call, CallState.DISCONNECTED);
         call.removeListener(this);
     }