Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a56a0ce authored by Victor Chang's avatar Victor Chang Committed by android-build-merger
Browse files

Allow google dialer code to be compiled against M and N SDKs for enterprise features 

am: f6550b4173

* commit 'f6550b41734c43f6e5d8e69b41a8808568dc166b':
  Allow google dialer code to be compiled against M and N SDKs for enterprise features
parents 20c5494e 74eed5e4

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

+2 −3
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import android.telephony.PhoneNumberUtils; 
import android.text.TextUtils;



import com.android.contacts.common.ContactsUtils;

import com.android.contacts.common.compat.DirectoryCompat;

import com.android.contacts.common.util.TelephonyManagerUtils;

import com.android.dialer.calllog.ContactInfoHelper;

import com.android.dialer.service.CachedNumberLookupService;
@@ -460,9 +461,7 @@ public class CallerInfoAsyncQuery { 
            int idIndex = cursor.getColumnIndex(Directory._ID);

            while (cursor.moveToNext()) {

                long id = cursor.getLong(idIndex);

                // TODO(b/26019967): in N SDK, use Directory.isRemoteDirectory

                if (id != Directory.DEFAULT && id != Directory.LOCAL_INVISIBLE && id != 1000000000

                        && id != 1000000001) {

                if (DirectoryCompat.isRemoteDirectory(id)) {

                    results.add(id);

                }

            }