commit d8e1e9a22c2280c0dae3fafa423126fd3d073989
author Yorke Lee <yorkelee@google.com> Wed Dec 09 16:52:12 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 09 16:52:12 2015 +0000
tree 5c4a3ced3bfd9b19d4008bbae3d820f3133ff552
parent accf2d994f505dbeda1fe4a33b90a53cafda34e4
parent a6896116a51700ce134d801c632dea6a21f5d936

Merge "Fix for Google Caller ID not working" into ub-contactsdialer-b-dev

InCallUI/src/com/android/incallui/CallerInfoAsyncQuery.java

diff --git a/InCallUI/src/com/android/incallui/CallerInfoAsyncQuery.java b/InCallUI/src/com/android/incallui/CallerInfoAsyncQuery.java
index 1a0cd96..bf254c6 100644
--- a/InCallUI/src/com/android/incallui/CallerInfoAsyncQuery.java
+++ b/InCallUI/src/com/android/incallui/CallerInfoAsyncQuery.java
@@ -33,6 +33,7 @@
 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 @@
     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
@@ -440,9 +439,7 @@
         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");
         }