diff options
| author | Victor Chang <vichang@google.com> | 2015-12-07 20:37:37 +0000 |
|---|---|---|
| committer | Victor Chang <vichang@google.com> | 2015-12-07 20:37:37 +0000 |
| commit | 9c06ba45497a43580e14dd9517c045c3a39f9fd0 (patch) | |
| tree | 03e5ee98f2cc629ce7e9490edad7b5535bc7bf8e /src/com/android/dialer | |
| parent | ac03b699be2664a1abdbe64073b48fbf21efa39d (diff) | |
Use ContactsUtil.FLAG_N_FEATURE in ContactInfoHelper
BUG=25899500
Change-Id: Ie235822462e2a430b1bec93923bd8c1fe00f101f
Diffstat (limited to 'src/com/android/dialer')
| -rw-r--r-- | src/com/android/dialer/calllog/ContactInfoHelper.java | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/com/android/dialer/calllog/ContactInfoHelper.java b/src/com/android/dialer/calllog/ContactInfoHelper.java index a68d8f253..44c97ad52 100644 --- a/src/com/android/dialer/calllog/ContactInfoHelper.java +++ b/src/com/android/dialer/calllog/ContactInfoHelper.java @@ -30,6 +30,7 @@ import android.telephony.PhoneNumberUtils; import android.text.TextUtils; import android.util.Log; +import com.android.contacts.common.ContactsUtils; import com.android.contacts.common.util.Constants; import com.android.contacts.common.util.PermissionsUtil; import com.android.contacts.common.util.PhoneNumberHelper; @@ -48,11 +49,6 @@ import org.json.JSONObject; public class ContactInfoHelper { private static final String TAG = ContactInfoHelper.class.getSimpleName(); - private static final boolean FLAG_PRE_N_FEATURE = - true // Enforce Pre-N (M) behavior in release build - || Build.VERSION.SDK_INT <= Build.VERSION_CODES.M - || !Build.VERSION.CODENAME.startsWith("N"); - private final Context mContext; private final String mCurrentCountryIso; @@ -392,7 +388,7 @@ public class ContactInfoHelper { // Get URI for the number in the PhoneLookup table, with a parameter to indicate whether // the number is a SIP number. Uri uri = PhoneLookup.ENTERPRISE_CONTENT_FILTER_URI; - if (FLAG_PRE_N_FEATURE) { + if (!ContactsUtils.FLAG_N_FEATURE) { if (directoryId != -1) { // ENTERPRISE_CONTENT_FILTER_URI in M doesn't support directory lookup uri = PhoneLookup.CONTENT_FILTER_URI; |