commit 2155a2f4fdc8d977ac1c33f7223b1ba4b55aee9e
author Brandon Maxwell <maxwelb@google.com> Wed Nov 04 21:52:42 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 04 21:52:42 2015 +0000
tree ea6b2f0f808add879b83afffa2b0df3662ef5c7e
parent 90c0f0508e1173f7d45f3d165ce93760b69ea992
parent 5e0d2d1c7ddac7be7c814492441bbde54fba8ca9

Merge "Retrieving nameAlternative for ContactInfo" into ub-contactsdialer-a-dev

InCallUI/src/com/android/incallui/CallerInfo.java

diff --git a/InCallUI/src/com/android/incallui/CallerInfo.java b/InCallUI/src/com/android/incallui/CallerInfo.java
index 3ddeb71..2ed5722 100644
--- a/InCallUI/src/com/android/incallui/CallerInfo.java
+++ b/InCallUI/src/com/android/incallui/CallerInfo.java
@@ -31,6 +31,7 @@
 
 import com.android.contacts.common.util.PhoneNumberHelper;
 import com.android.contacts.common.util.TelephonyManagerUtils;
+import com.android.dialer.calllog.ContactInfoHelper;
 
 /**
  * Looks up caller information for the given phone number.
@@ -177,6 +178,12 @@
                     info.name = cursor.getString(columnIndex);
                 }
 
+                columnIndex = cursor.getColumnIndex(PhoneLookup.LOOKUP_KEY);
+                if (columnIndex != -1) {
+                    info.nameAlternative = ContactInfoHelper.lookUpDisplayNameAlternative(
+                            context, cursor.getString(columnIndex));
+                }
+
                 // Look for the number
                 columnIndex = cursor.getColumnIndex(PhoneLookup.NUMBER);
                 if (columnIndex != -1) {