diff options
| author | Victor Chang <vichang@google.com> | 2016-01-12 22:19:34 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-01-12 22:19:34 +0000 |
| commit | 0a56a0cee81248bcaa373c1d71724f5ad77c0af4 (patch) | |
| tree | 2f200a233e7b30dd16d2634878604dd6e3e8f978 /InCallUI | |
| parent | 20c5494e7ab360a39e4e47df336f285a2dc654d0 (diff) | |
| parent | 74eed5e47a3d4a3670235695e51869764ca046a0 (diff) | |
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
Diffstat (limited to 'InCallUI')
| -rw-r--r-- | InCallUI/src/com/android/incallui/CallerInfoAsyncQuery.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/InCallUI/src/com/android/incallui/CallerInfoAsyncQuery.java b/InCallUI/src/com/android/incallui/CallerInfoAsyncQuery.java index 9080484ed..8d45efb97 100644 --- a/InCallUI/src/com/android/incallui/CallerInfoAsyncQuery.java +++ b/InCallUI/src/com/android/incallui/CallerInfoAsyncQuery.java @@ -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); } } |