diff options
author | linyuh <linyuh@google.com> | 2018-03-26 12:46:18 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-03-26 22:23:52 -0700 |
commit | 437ae9552cce7768068fa92663740711ee541417 (patch) | |
tree | 1ae9af42ed23c09404b87ca613247e18c3fa10d2 /java/com/android/dialer/phonenumbercache/PhoneQuery.java | |
parent | cf14ecbc3cb604804ae1f9d01e47444fcf0eedc6 (diff) |
Remove obsolete version checks and compat utilities after min SDK was bumped up to N.
Test: Existing tests
PiperOrigin-RevId: 190508397
Change-Id: Ia5f33e45af1d1cc666fec5f43efa564b2b68c193
Diffstat (limited to 'java/com/android/dialer/phonenumbercache/PhoneQuery.java')
-rw-r--r-- | java/com/android/dialer/phonenumbercache/PhoneQuery.java | 57 |
1 files changed, 15 insertions, 42 deletions
diff --git a/java/com/android/dialer/phonenumbercache/PhoneQuery.java b/java/com/android/dialer/phonenumbercache/PhoneQuery.java index 5ddd5f846..a43e489e5 100644 --- a/java/com/android/dialer/phonenumbercache/PhoneQuery.java +++ b/java/com/android/dialer/phonenumbercache/PhoneQuery.java @@ -16,10 +16,6 @@ package com.android.dialer.phonenumbercache; -import android.net.Uri; -import android.os.Build.VERSION; -import android.os.Build.VERSION_CODES; -import android.provider.ContactsContract; import android.provider.ContactsContract.CommonDataKinds.Phone; import android.provider.ContactsContract.Contacts; import android.provider.ContactsContract.PhoneLookup; @@ -27,27 +23,27 @@ import android.provider.ContactsContract.PhoneLookup; /** The queries to look up the {@link ContactInfo} for a given number in the Call Log. */ final class PhoneQuery { - public static final int PERSON_ID = 0; - public static final int NAME = 1; - public static final int PHONE_TYPE = 2; - public static final int LABEL = 3; - public static final int MATCHED_NUMBER = 4; - public static final int NORMALIZED_NUMBER = 5; - public static final int PHOTO_ID = 6; - public static final int LOOKUP_KEY = 7; - public static final int PHOTO_URI = 8; + static final int PERSON_ID = 0; + static final int NAME = 1; + static final int PHONE_TYPE = 2; + static final int LABEL = 3; + static final int MATCHED_NUMBER = 4; + static final int NORMALIZED_NUMBER = 5; + static final int PHOTO_ID = 6; + static final int LOOKUP_KEY = 7; + static final int PHOTO_URI = 8; /** Projection to look up a contact's DISPLAY_NAME_ALTERNATIVE */ - public static final String[] DISPLAY_NAME_ALTERNATIVE_PROJECTION = + static final String[] DISPLAY_NAME_ALTERNATIVE_PROJECTION = new String[] { Contacts.DISPLAY_NAME_ALTERNATIVE, }; - public static final int NAME_ALTERNATIVE = 0; + static final int NAME_ALTERNATIVE = 0; - public static final String[] ADDITIONAL_CONTACT_INFO_PROJECTION = + static final String[] ADDITIONAL_CONTACT_INFO_PROJECTION = new String[] {Phone.DISPLAY_NAME_ALTERNATIVE, Phone.CARRIER_PRESENCE}; - public static final int ADDITIONAL_CONTACT_INFO_DISPLAY_NAME_ALTERNATIVE = 0; - public static final int ADDITIONAL_CONTACT_INFO_CARRIER_PRESENCE = 1; + static final int ADDITIONAL_CONTACT_INFO_DISPLAY_NAME_ALTERNATIVE = 0; + static final int ADDITIONAL_CONTACT_INFO_CARRIER_PRESENCE = 1; /** * Projection to look up the ContactInfo. Does not include DISPLAY_NAME_ALTERNATIVE as that column @@ -66,31 +62,8 @@ final class PhoneQuery { PhoneLookup.LOOKUP_KEY, PhoneLookup.PHOTO_URI }; - /** - * Similar to {@link PHONE_LOOKUP_PROJECTION}. In pre-N, contact id is stored in {@link - * PhoneLookup#_ID} in non-sip query. - */ - private static final String[] BACKWARD_COMPATIBLE_NON_SIP_PHONE_LOOKUP_PROJECTION = - new String[] { - PhoneLookup._ID, - PhoneLookup.DISPLAY_NAME, - PhoneLookup.TYPE, - PhoneLookup.LABEL, - PhoneLookup.NUMBER, - PhoneLookup.NORMALIZED_NUMBER, - PhoneLookup.PHOTO_ID, - PhoneLookup.LOOKUP_KEY, - PhoneLookup.PHOTO_URI - }; - public static String[] getPhoneLookupProjection(Uri phoneLookupUri) { - if (VERSION.SDK_INT >= VERSION_CODES.N) { + static String[] getPhoneLookupProjection() { return PHONE_LOOKUP_PROJECTION; - } - // Pre-N - boolean isSip = - phoneLookupUri.getBooleanQueryParameter( - ContactsContract.PhoneLookup.QUERY_PARAMETER_SIP_ADDRESS, false); - return (isSip) ? PHONE_LOOKUP_PROJECTION : BACKWARD_COMPATIBLE_NON_SIP_PHONE_LOOKUP_PROJECTION; } } |