Merge "Require N for preferred SIM query"
diff --git a/java/com/android/dialer/precall/impl/CallingAccountSelector.java b/java/com/android/dialer/precall/impl/CallingAccountSelector.java
index fe3a5b6..144d94e 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.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 @@
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)),