diff options
| author | Santos Cordon <santoscordon@google.com> | 2014-08-21 23:47:52 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-21 23:47:53 +0000 |
| commit | 9593853ba1d72249b2405bfca1fa410dcde3f290 (patch) | |
| tree | 97f175e59d5b59fcf4993e290ef626fbf98e0bdc | |
| parent | b2881330348b8dd00c2fea630963b2211ac1eade (diff) | |
| parent | 2094b920802ef0ecf9373cc90b7969f516b44c7e (diff) | |
Merge "Fix parentID for conference call support." into lmp-dev
| -rw-r--r-- | InCallUI/src/com/android/incallui/Call.java | 3 | ||||
| -rw-r--r-- | InCallUI/src/com/android/incallui/CallList.java | 2 |
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(); } |