summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
Diffstat (limited to 'java')
-rw-r--r--java/com/android/dialer/searchfragment/directories/DirectoryContactViewHolder.java14
1 files changed, 12 insertions, 2 deletions
diff --git a/java/com/android/dialer/searchfragment/directories/DirectoryContactViewHolder.java b/java/com/android/dialer/searchfragment/directories/DirectoryContactViewHolder.java
index f6cdc4fc6..6e0a05a77 100644
--- a/java/com/android/dialer/searchfragment/directories/DirectoryContactViewHolder.java
+++ b/java/com/android/dialer/searchfragment/directories/DirectoryContactViewHolder.java
@@ -130,9 +130,19 @@ public final class DirectoryContactViewHolder extends RecyclerView.ViewHolder
}
private static Uri getContactUri(SearchCursor cursor) {
- long contactId = cursor.getLong(Projections.ID);
String lookupKey = cursor.getString(Projections.LOOKUP_KEY);
- return Contacts.getLookupUri(contactId, lookupKey)
+
+ Uri baseUri;
+ // If the contact is a local work contact, leave the contact id out of the uri since it
+ // isn't valid.
+ if (DirectoryCompat.isOnlyEnterpriseDirectoryId(cursor.getDirectoryId())) {
+ baseUri = Uri.withAppendedPath(Contacts.CONTENT_LOOKUP_URI, lookupKey);
+ } else {
+ long contactId = cursor.getLong(Projections.ID);
+ baseUri = Contacts.getLookupUri(contactId, lookupKey);
+ }
+
+ return baseUri
.buildUpon()
.appendQueryParameter(
ContactsContract.DIRECTORY_PARAM_KEY, String.valueOf(cursor.getDirectoryId()))