diff options
| author | Christine Chen <christinech@google.com> | 2013-09-14 00:29:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-14 00:29:47 +0000 |
| commit | 848c949a5789ae94ea266165fbd893b81ec4f7ce (patch) | |
| tree | da15e12e93e26980a897a1b2a834eaaf80cb7207 | |
| parent | 2735001b0c90b9b09a0c8da3823b572b4aa01620 (diff) | |
| parent | 314b2aaa1fa1ef799270987e964f7df4d983b9ee (diff) | |
Merge "Always checks for conference call in CallCard." into klp-dev
| -rw-r--r-- | InCallUI/src/com/android/incallui/CallCardPresenter.java | 4 |
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 5da6b43e2..279925d50 100644 --- a/InCallUI/src/com/android/incallui/CallCardPresenter.java +++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java @@ -80,7 +80,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); } } @@ -93,7 +93,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 |