From c2317a2633f80390e20e7d337280d5bd3a2ac781 Mon Sep 17 00:00:00 2001
From: twyen <twyen@google.com>
Date: Tue, 21 Nov 2017 11:09:53 -0800
Subject: 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
---
 java/com/android/dialer/precall/impl/CallingAccountSelector.java | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'java/com/android/dialer/precall')

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)),
-- 
cgit v1.2.3