diff options
| author | Eric Erfanian <erfanian@google.com> | 2017-05-16 00:09:31 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-05-16 00:09:31 +0000 |
| commit | c57430a61eab62e88372f386c75989dab6332608 (patch) | |
| tree | b606f1899f80fcd0ea3ee753ce799883d5a673ab /java/com/android/incallui/ConferenceParticipantListAdapter.java | |
| parent | 9842b4a7fd1d852b1353af806da4913b4298d516 (diff) | |
| parent | 0c9dbf507b53a12bdf577ff3e55c1686a2e089de (diff) | |
Merge "Update Dialer to v10 RC32" into oc-dev
am: 0c9dbf507b
Change-Id: I5f90090090c6e430d83fcdd294082c1f5237ade8
Diffstat (limited to 'java/com/android/incallui/ConferenceParticipantListAdapter.java')
| -rw-r--r-- | java/com/android/incallui/ConferenceParticipantListAdapter.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/java/com/android/incallui/ConferenceParticipantListAdapter.java b/java/com/android/incallui/ConferenceParticipantListAdapter.java index 72c0fcd20..712bdefa6 100644 --- a/java/com/android/incallui/ConferenceParticipantListAdapter.java +++ b/java/com/android/incallui/ConferenceParticipantListAdapter.java @@ -232,11 +232,14 @@ public class ConferenceParticipantListAdapter extends BaseAdapter { boolean thisRowCanDisconnect = call.can(android.telecom.Call.Details.CAPABILITY_DISCONNECT_FROM_CONFERENCE); + String name = + ContactDisplayUtils.getPreferredDisplayName( + contactCache.namePrimary, contactCache.nameAlternative, mContactsPreferences); + setCallerInfoForRow( result, contactCache.namePrimary, - ContactDisplayUtils.getPreferredDisplayName( - contactCache.namePrimary, contactCache.nameAlternative, mContactsPreferences), + call.updateNameIfRestricted(name), contactCache.number, contactCache.label, contactCache.lookupKey, |