diff options
| author | Tyler Gunn <tgunn@google.com> | 2014-11-05 17:03:38 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-05 17:03:39 +0000 |
| commit | 662626ec0a406066a698635bc746246db76ec81c (patch) | |
| tree | 651048a027aa450dcdbffe6cbe1e1eb3fcab0e91 /InCallUI | |
| parent | 9c27100893078ff9df5c95bbdd5e9019350ac8d6 (diff) | |
| parent | 8d1b64c7c4cd0b92e055cbdc7beb3cd820c0c5da (diff) | |
Merge "Fixing conference participant bug." into lmp-mr1-dev
Diffstat (limited to 'InCallUI')
| -rw-r--r-- | InCallUI/src/com/android/incallui/ConferenceManagerPresenter.java | 7 |
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, |