diff options
author | Tony Mak <tonymak@google.com> | 2016-03-11 21:23:39 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-03-11 21:23:39 +0000 |
commit | ebfbfa10d95ef21373cf7c112eac52413b11c525 (patch) | |
tree | 8acc61c55d6e769beb3e9c2dc1237da181f4087e /InCallUI/src/com/android/incallui/CallerInfo.java | |
parent | a03c1f480e61c1f3507e294095e21b73d23a5e58 (diff) | |
parent | 3dc68df0b856eace41aaca6bd0266da023c18835 (diff) |
Merge "Query lookup uri with work lookup key directly is not allowed" into nyc-dev
Diffstat (limited to 'InCallUI/src/com/android/incallui/CallerInfo.java')
-rw-r--r-- | InCallUI/src/com/android/incallui/CallerInfo.java | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/InCallUI/src/com/android/incallui/CallerInfo.java b/InCallUI/src/com/android/incallui/CallerInfo.java index a638e114c..f270678e0 100644 --- a/InCallUI/src/com/android/incallui/CallerInfo.java +++ b/InCallUI/src/com/android/incallui/CallerInfo.java @@ -237,12 +237,6 @@ public class CallerInfo { 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) { @@ -326,6 +320,9 @@ public class CallerInfo { : contactRef.getQueryParameter(ContactsContract.DIRECTORY_PARAM_KEY); final Long directoryId = directory == null ? null : Longs.tryParse(directory); info.userType = ContactsUtils.determineUserType(directoryId, contactId); + + info.nameAlternative = ContactInfoHelper.lookUpDisplayNameAlternative( + context, info.lookupKeyOrNull, info.userType); } cursor.close(); } |