diff options
author | Victor Chang <vichang@google.com> | 2015-12-09 11:05:22 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-12-09 11:05:22 +0000 |
commit | accf2d994f505dbeda1fe4a33b90a53cafda34e4 (patch) | |
tree | 12974621a480ffe6d5c70085897434b9275228e8 /InCallUI | |
parent | a7086bc66eca9bbae80fb40ec532b3253361ee53 (diff) | |
parent | 327a852b26c06c5b2fe4702a5bd5ca140560d3b3 (diff) |
Merge "Use ContactsUtil.FLAG_N_FEATURE in CallerInfoAsyncQuery" into ub-contactsdialer-b-dev
Diffstat (limited to 'InCallUI')
-rw-r--r-- | InCallUI/src/com/android/incallui/CallerInfoAsyncQuery.java | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/InCallUI/src/com/android/incallui/CallerInfoAsyncQuery.java b/InCallUI/src/com/android/incallui/CallerInfoAsyncQuery.java index 97a95ac50..3467684f5 100644 --- a/InCallUI/src/com/android/incallui/CallerInfoAsyncQuery.java +++ b/InCallUI/src/com/android/incallui/CallerInfoAsyncQuery.java @@ -33,6 +33,7 @@ import android.provider.ContactsContract.Directory; import android.telephony.PhoneNumberUtils; import android.text.TextUtils; +import com.android.contacts.common.ContactsUtils; import com.android.contacts.common.util.TelephonyManagerUtils; import com.android.dialer.calllog.ContactInfoHelper; @@ -55,8 +56,6 @@ public class CallerInfoAsyncQuery { private static final int EVENT_EMERGENCY_NUMBER = 4; private static final int EVENT_VOICEMAIL_NUMBER = 5; - private static final boolean FLAG_N_FEATURE = false; - private CallerInfoAsyncQueryHandler mHandler; // If the CallerInfo query finds no contacts, should we use the @@ -437,9 +436,7 @@ public class CallerInfoAsyncQuery { ArrayList<Long> results = new ArrayList<>(); Uri uri = Directory.CONTENT_URI; - // TODO(b/26019967): - // replace VERSION.CODENAME.startsWith("N") by VERSION.SDK_INT >= VERSION_CODES.NYC - if (FLAG_N_FEATURE && Build.VERSION.CODENAME.startsWith("N")) { + if (ContactsUtils.FLAG_N_FEATURE) { uri = Uri.withAppendedPath(ContactsContract.AUTHORITY_URI, "directories_enterprise"); } |