summaryrefslogtreecommitdiff
path: root/java/com/android/dialer/precall
diff options
context:
space:
mode:
authortwyen <twyen@google.com>2017-11-21 11:09:53 -0800
committerCopybara-Service <copybara-piper@google.com>2017-11-21 12:16:02 -0800
commitc2317a2633f80390e20e7d337280d5bd3a2ac781 (patch)
tree39f468cabfc58c2f8304ba55e9a002efce3b213b /java/com/android/dialer/precall
parente51ca38d99bdc4b5d88b0bacf3905c927c3656bf (diff)
Require N for preferred SIM query
PhoneLookup.DATA_ID is only available after N. The fallback database should address this in a future CL. Bug: 69420158 Test: CallingAccountSelectorTest PiperOrigin-RevId: 176534281 Change-Id: I51ae1705fce6d7d4138b41fbd00d131447e49786
Diffstat (limited to 'java/com/android/dialer/precall')
-rw-r--r--java/com/android/dialer/precall/impl/CallingAccountSelector.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/java/com/android/dialer/precall/impl/CallingAccountSelector.java b/java/com/android/dialer/precall/impl/CallingAccountSelector.java
index fe3a5b631..144d94e20 100644
--- a/java/com/android/dialer/precall/impl/CallingAccountSelector.java
+++ b/java/com/android/dialer/precall/impl/CallingAccountSelector.java
@@ -22,6 +22,8 @@ import android.content.ContentValues;
import android.content.Context;
import android.database.Cursor;
import android.net.Uri;
+import android.os.Build.VERSION;
+import android.os.Build.VERSION_CODES;
import android.provider.ContactsContract.PhoneLookup;
import android.support.annotation.MainThread;
import android.support.annotation.NonNull;
@@ -261,6 +263,9 @@ public class CallingAccountSelector implements PreCallAction {
private static Optional<String> getDataId(
@NonNull ContentResolver contentResolver, @Nullable String phoneNumber) {
Assert.isWorkerThread();
+ if (VERSION.SDK_INT < VERSION_CODES.N) {
+ return Optional.absent();
+ }
try (Cursor cursor =
contentResolver.query(
Uri.withAppendedPath(PhoneLookup.CONTENT_FILTER_URI, Uri.encode(phoneNumber)),