From 7a266602c38a3faced884c4f0a4568bc89beca31 Mon Sep 17 00:00:00 2001 From: calderwoodra Date: Fri, 16 Mar 2018 16:06:01 -0700 Subject: Remove contact id from all non-local directory contacts. Bug: 72755010 Test: manaul PiperOrigin-RevId: 189408046 Change-Id: Ia23442b2243e2008042e0046a21f840a30dbf008 --- .../directories/DirectoryContactViewHolder.java | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'java/com/android') diff --git a/java/com/android/dialer/searchfragment/directories/DirectoryContactViewHolder.java b/java/com/android/dialer/searchfragment/directories/DirectoryContactViewHolder.java index 6e0a05a77..fbb662ce9 100644 --- a/java/com/android/dialer/searchfragment/directories/DirectoryContactViewHolder.java +++ b/java/com/android/dialer/searchfragment/directories/DirectoryContactViewHolder.java @@ -131,18 +131,7 @@ public final class DirectoryContactViewHolder extends RecyclerView.ViewHolder private static Uri getContactUri(SearchCursor cursor) { String lookupKey = cursor.getString(Projections.LOOKUP_KEY); - - 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 + return Uri.withAppendedPath(Contacts.CONTENT_LOOKUP_URI, lookupKey) .buildUpon() .appendQueryParameter( ContactsContract.DIRECTORY_PARAM_KEY, String.valueOf(cursor.getDirectoryId())) -- cgit v1.2.3