diff options
| author | twyen <twyen@google.com> | 2018-06-26 15:51:30 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-06-26 15:51:30 -0700 |
| commit | f9d508090cbf3b9f85b72241c77f625c152448bc (patch) | |
| tree | 198fcf37848a75c8d68f74679a56fd9dc0f4891b /java/com/android/incallui/RttRequestDialogFragment.java | |
| parent | a3624bf414450b3dd35a8b358db1a2ffd7dee21a (diff) | |
| parent | e6262b0bcebc185ee15ad22d6e723e80c2b267a2 (diff) | |
Merge changes I45374e61,I265dcc61,Id4622886,I09d0df69,I3ea0fb46 am: 2f6900466e
am: e6262b0bce
Change-Id: I46367591d38db2178a9f5ac1b5b8ac8ca0487efd
Diffstat (limited to 'java/com/android/incallui/RttRequestDialogFragment.java')
| -rw-r--r-- | java/com/android/incallui/RttRequestDialogFragment.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/java/com/android/incallui/RttRequestDialogFragment.java b/java/com/android/incallui/RttRequestDialogFragment.java index 5437cc699..589625b8e 100644 --- a/java/com/android/incallui/RttRequestDialogFragment.java +++ b/java/com/android/incallui/RttRequestDialogFragment.java @@ -28,9 +28,9 @@ import android.text.TextDirectionHeuristics; import android.text.TextUtils; import android.view.View; import android.widget.TextView; -import com.android.contacts.common.util.ContactDisplayUtils; import com.android.dialer.common.Assert; import com.android.dialer.common.LogUtil; +import com.android.dialer.contacts.ContactsComponent; import com.android.incallui.ContactInfoCache.ContactCacheEntry; import com.android.incallui.ContactInfoCache.ContactInfoCacheCallback; import com.android.incallui.call.CallList; @@ -130,10 +130,9 @@ public class RttRequestDialogFragment extends DialogFragment { private CharSequence getNameOrNumber(ContactCacheEntry entry, Context context) { String preferredName = - ContactDisplayUtils.getPreferredDisplayName( - entry.namePrimary, - entry.nameAlternative, - ContactsPreferencesFactory.newContactsPreferences(context)); + ContactsComponent.get(context) + .contactDisplayPreferences() + .getDisplayName(entry.namePrimary, entry.nameAlternative); if (TextUtils.isEmpty(preferredName)) { return TextUtils.isEmpty(entry.number) ? null |