From 8005ef13459021aaf1ef0f9ed545fb714df4bfc5 Mon Sep 17 00:00:00 2001 From: Wenyi Wang Date: Tue, 24 Nov 2015 15:31:41 -0800 Subject: Avoid using prioritized mimetype on pre-M SDKs Restores code deleted in ag/643285 because the code was used on pre-M. Bug:25629359 Change-Id: Ief60d301fd8d3c018ce03388c56264a2db727224 --- src/com/android/dialer/filterednumber/NumbersAdapter.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/com/android/dialer/filterednumber/NumbersAdapter.java') diff --git a/src/com/android/dialer/filterednumber/NumbersAdapter.java b/src/com/android/dialer/filterednumber/NumbersAdapter.java index 170610712..4e2e578a8 100644 --- a/src/com/android/dialer/filterednumber/NumbersAdapter.java +++ b/src/com/android/dialer/filterednumber/NumbersAdapter.java @@ -20,6 +20,7 @@ import android.app.FragmentManager; import android.content.Context; import android.content.res.Resources; import android.provider.ContactsContract; +import android.provider.ContactsContract.CommonDataKinds.Phone; import android.text.BidiFormatter; import android.text.TextDirectionHeuristics; import android.text.TextUtils; @@ -30,6 +31,7 @@ import android.widget.TextView; import com.android.contacts.common.ContactPhotoManager; import com.android.contacts.common.ContactPhotoManager.DefaultImageRequest; +import com.android.contacts.common.compat.CompatUtils; import com.android.contacts.common.util.UriUtils; import com.android.dialer.R; import com.android.dialer.calllog.ContactInfo; @@ -63,9 +65,9 @@ public class NumbersAdapter extends SimpleCursorAdapter { final QuickContactBadge quickContactBadge = (QuickContactBadge) view.findViewById(R.id.quick_contact_photo); quickContactBadge.setOverlay(null); - quickContactBadge.setPrioritizedMimeType( - ContactsContract.CommonDataKinds.Phone.CONTENT_ITEM_TYPE); - + if (CompatUtils.hasPrioritizedMimeType()) { + quickContactBadge.setPrioritizedMimeType(Phone.CONTENT_ITEM_TYPE); + } final ContactInfo info = mContactInfoHelper.lookupNumber(number, countryIso); final CharSequence locationOrType = getNumberTypeOrLocation(info); final String displayNumber = getDisplayNumber(info); -- cgit v1.2.3