summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristine Chen <christinech@google.com>2013-09-13 16:55:22 -0700
committerChristine Chen <christinech@google.com>2013-09-13 16:55:22 -0700
commit314b2aaa1fa1ef799270987e964f7df4d983b9ee (patch)
treedf0bbe7a8bd01443ec84baa1675f06d696f619a5
parente1a53978a9b73bc4336099529ea50c2bc2e80989 (diff)
Always checks for conference call in CallCard.
Bug: 10746228 Change-Id: I23d901381b1a65e481d835d88f5ba46c291e724e
-rw-r--r--InCallUI/src/com/android/incallui/CallCardPresenter.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/InCallUI/src/com/android/incallui/CallCardPresenter.java b/InCallUI/src/com/android/incallui/CallCardPresenter.java
index 7496f8a4a..c2a4fb4c8 100644
--- a/InCallUI/src/com/android/incallui/CallCardPresenter.java
+++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java
@@ -84,7 +84,7 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi>
call.getState() == Call.State.INCOMING);
// start processing lookups right away.
- startContactInfoSearch(identification, true, false,
+ startContactInfoSearch(identification, true, call.isConferenceCall(),
call.getState() == Call.State.INCOMING);
}
}
@@ -97,7 +97,7 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi>
// Contact search may have completed before ui is ready.
if (mPrimaryContactInfo != null) {
- updatePrimaryDisplayInfo(mPrimaryContactInfo, false);
+ updatePrimaryDisplayInfo(mPrimaryContactInfo, isConference(mPrimary));
}
// Register for call state changes last