commit 2c2e9800fd1823800135d83ccb33e8bace6a031e
author Santos Cordon <santoscordon@google.com> Thu Aug 29 02:41:12 2013 -0700
committer Santos Cordon <santoscordon@google.com> Thu Aug 29 02:41:12 2013 -0700
tree d4fde8b01faf8af5011dfc731dc80300faa9ef75
parent afac0a4580b73cd500d3ec0d8c23135ec7fe9767

Stop overwriting CALL_WAITING with INCOMING

Code too ambitious about setting INCOMING state caused CALL_WAITING
state to be overwritten.
Also fixed unnecessary setting of DISCONNECT.  In both cases the method
updateCallFromConnection() was already setting the states...and in the
call waiting case...a more accurate state.

bug:10396126
Change-Id: Ib0bb7ab2ed87858c441ef0c1bd38820a1c09baa6

common/src/com/android/services/telephony/common/Call.java

diff --git a/common/src/com/android/services/telephony/common/Call.java b/common/src/com/android/services/telephony/common/Call.java
index f397f62..debad61 100644
--- a/common/src/com/android/services/telephony/common/Call.java
+++ b/common/src/com/android/services/telephony/common/Call.java
@@ -372,7 +372,7 @@
     public String toString() {
         return Objects.toStringHelper(this)
                 .add("mCallId", mCallId)
-                .add("mState", mState)
+                .add("mState", STATE_MAP.get(mState))
                 .add("mDisconnectCause", mDisconnectCause)
                 .add("mCapabilities", mCapabilities)
                 .add("mConnectTime", mConnectTime)

src/com/android/phone/CallModeler.java

diff --git a/src/com/android/phone/CallModeler.java b/src/com/android/phone/CallModeler.java
index 6b7a137..393e054 100644
--- a/src/com/android/phone/CallModeler.java
+++ b/src/com/android/phone/CallModeler.java
@@ -199,7 +199,6 @@
         final Call call = getCallFromMap(mCallMap, conn, true);
 
         updateCallFromConnection(call, conn, false);
-        call.setState(Call.State.INCOMING);
 
         for (int i = 0; i < mListeners.size(); ++i) {
             if (call != null) {
@@ -217,7 +216,6 @@
             final boolean wasConferenced = call.getState() == State.CONFERENCED;
 
             updateCallFromConnection(call, conn, false);
-            call.setState(Call.State.DISCONNECTED);
 
             for (int i = 0; i < mListeners.size(); ++i) {
                 mListeners.get(i).onDisconnect(call);