am e8af6de0: Merge "Fix parentID for conference call support." into lmp-dev

* commit 'e8af6de0d48d06dfc5881cf0f7452767883cd5dc':
  Fix parentID for conference call support.

2 files changed, 3 insertions, 2 deletions

diff --git a/InCallUI/src/com/android/incallui/Call.java b/InCallUI/src/com/android/incallui/Call.java
index 075ec981d..6bd3d0b9d 100644
--- a/InCallUI/src/com/android/incallui/Call.java
+++ b/InCallUI/src/com/android/incallui/Call.java
@@ -201,6 +201,7 @@ public final class Call {
     }
 
     private void updateFromTelecommCall() {
+        Log.d(this, "updateFromTelecommCall: " + mTelecommCall);
         setState(translateState(mTelecommCall.getState()));
         setDisconnectCause(mTelecommCall.getDetails().getDisconnectCauseCode());
 
@@ -380,7 +381,7 @@ public final class Call {
     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(),
diff --git a/InCallUI/src/com/android/incallui/CallList.java b/InCallUI/src/com/android/incallui/CallList.java
index a3fa58dfd..0908b56ad 100644
--- a/InCallUI/src/com/android/incallui/CallList.java
+++ b/InCallUI/src/com/android/incallui/CallList.java
@@ -136,8 +136,8 @@ public class CallList implements InCallPhoneListener {
      * 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();
     }