summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTyler Gunn <tgunn@google.com>2014-11-04 14:59:14 -0800
committerTyler Gunn <tgunn@google.com>2014-11-04 14:59:14 -0800
commit8d1b64c7c4cd0b92e055cbdc7beb3cd820c0c5da (patch)
treea0148e40e0f2b381dd0f5359755c3c07b1b51231
parentd644aef567decca5d6351bb4def4b4e65517836e (diff)
Fixing conference participant bug.
Fixing a bug where the conference participant calls, having never been an active or background call, will never have a cached contact info record created, causing them to not show up in the conference manager. Bug: 18228141 Change-Id: I15999c983b5d6ce9600b71ad8d8e28582a328c95
-rw-r--r--InCallUI/src/com/android/incallui/ConferenceManagerPresenter.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/InCallUI/src/com/android/incallui/ConferenceManagerPresenter.java b/InCallUI/src/com/android/incallui/ConferenceManagerPresenter.java
index f754fdec8..e227c1880 100644
--- a/InCallUI/src/com/android/incallui/ConferenceManagerPresenter.java
+++ b/InCallUI/src/com/android/incallui/ConferenceManagerPresenter.java
@@ -130,8 +130,13 @@ public class ConferenceManagerPresenter
boolean thisRowCanDisconnect = PhoneCapabilities.can(
callCapabilities, PhoneCapabilities.DISCONNECT_FROM_CONFERENCE);
// Fill in the row in the UI for this caller.
- final ContactCacheEntry contactCache =
+ ContactCacheEntry contactCache =
ContactInfoCache.getInstance(mContext).getInfo(mCallerIds[i]);
+ if (contactCache == null) {
+ contactCache = ContactInfoCache.buildCacheEntryFromCall(mContext, call,
+ call.getState() == Call.State.INCOMING);
+ }
+
updateManageConferenceRow(
i /* row index */,
contactCache,