commit 2094b920802ef0ecf9373cc90b7969f516b44c7e
author Santos Cordon <santoscordon@google.com> Thu Aug 14 01:53:44 2014 -0700
committer Santos Cordon <santoscordon@google.com> Thu Aug 21 14:50:17 2014 -0700
tree 53a8cfb4675ee265395a18b85ee49bfe35581b87
parent c44f654b992c6ab8a4acff9cb5aa2678c58755d9

Fix parentID for conference call support.

Fix and add some logging.

Bug: 17136172
Change-Id: I5ce30d09bbc82f00ac225406fa0998ce6ecd776f

InCallUI/src/com/android/incallui/Call.java

diff --git a/InCallUI/src/com/android/incallui/Call.java b/InCallUI/src/com/android/incallui/Call.java
index 075ec98..6bd3d0b 100644
--- a/InCallUI/src/com/android/incallui/Call.java
+++ b/InCallUI/src/com/android/incallui/Call.java
@@ -201,6 +201,7 @@
     }
 
     private void updateFromTelecommCall() {
+        Log.d(this, "updateFromTelecommCall: " + mTelecommCall);
         setState(translateState(mTelecommCall.getState()));
         setDisconnectCause(mTelecommCall.getDetails().getDisconnectCauseCode());
 
@@ -380,7 +381,7 @@
     public String toString() {
         return String.format(Locale.US, "[%s, %s, %s, children:%s, parent:%s, videoState:%d]",
                 mId,
-                State.toString(mState),
+                State.toString(getState()),
                 PhoneCapabilities.toString(mTelecommCall.getDetails().getCallCapabilities()),
                 mChildCallIds,
                 getParentId(),

InCallUI/src/com/android/incallui/CallList.java

diff --git a/InCallUI/src/com/android/incallui/CallList.java b/InCallUI/src/com/android/incallui/CallList.java
index a3fa58d..0908b56 100644
--- a/InCallUI/src/com/android/incallui/CallList.java
+++ b/InCallUI/src/com/android/incallui/CallList.java
@@ -136,8 +136,8 @@
      * Called when a single call has changed.
      */
     public void onUpdate(Call call) {
-        Log.d(this, "onUpdate - ", call);
         onUpdateCall(call);
+        Log.d(this, "onUpdate - ", call);
         notifyGenericListeners();
     }