From f2556612e0b4cba2d536191ea8caf155cc434492 Mon Sep 17 00:00:00 2001
From: erfanian <erfanian@google.com>
Date: Tue, 23 Jan 2018 09:55:59 -0800
Subject: Update Assisted Dialing references.

Test: existing unit tests
PiperOrigin-RevId: 182949031
Change-Id: I40955c6e5f4fe06687880d3e9ef4b91ef9c0b371
---
 java/com/android/dialer/assisteddialing/ConcreteCreator.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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

diff --git a/java/com/android/dialer/assisteddialing/ConcreteCreator.java b/java/com/android/dialer/assisteddialing/ConcreteCreator.java
index a3c96dbdc..c1ffbd396 100644
--- a/java/com/android/dialer/assisteddialing/ConcreteCreator.java
+++ b/java/com/android/dialer/assisteddialing/ConcreteCreator.java
@@ -23,6 +23,7 @@ import android.os.Build.VERSION_CODES;
 import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
 import android.support.annotation.VisibleForTesting;
+import android.support.v4.os.BuildCompat;
 import android.support.v4.os.UserManagerCompat;
 import android.telephony.TelephonyManager;
 import com.android.dialer.common.LogUtil;
@@ -102,7 +103,8 @@ public final class ConcreteCreator {
     }
 
     return (Build.VERSION.SDK_INT >= BUILD_CODE_FLOOR
-            && Build.VERSION.SDK_INT <= BUILD_CODE_CEILING)
+            && Build.VERSION.SDK_INT <= BUILD_CODE_CEILING
+            && !BuildCompat.isAtLeastP())
         && configProvider.getBoolean("assisted_dialing_enabled", false);
   }
 
-- 
cgit v1.2.3