diff options
| author | erfanian <erfanian@google.com> | 2018-03-02 14:54:35 -0800 |
|---|---|---|
| committer | Copybara-Service <copybara-piper@google.com> | 2018-03-02 14:55:37 -0800 |
| commit | d2e5d0be467cf8b200feeab73691e08d02f7da2e (patch) | |
| tree | 4008e50d81df0c20c2791f6d414775e65af62f13 /java/com/android/dialer/assisteddialing/ConcreteCreator.java | |
| parent | ed022b519350fad09509252d52cce71b18ff4c0c (diff) | |
Move assisted dialing out of P.
Bug: 73727182
Test: tested
PiperOrigin-RevId: 187673539
Change-Id: I9c790e912990fb8dc46da1c1057339c979ac9501
Diffstat (limited to 'java/com/android/dialer/assisteddialing/ConcreteCreator.java')
| -rw-r--r-- | java/com/android/dialer/assisteddialing/ConcreteCreator.java | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/java/com/android/dialer/assisteddialing/ConcreteCreator.java b/java/com/android/dialer/assisteddialing/ConcreteCreator.java index 2561e28cd..dfd28a661 100644 --- a/java/com/android/dialer/assisteddialing/ConcreteCreator.java +++ b/java/com/android/dialer/assisteddialing/ConcreteCreator.java @@ -23,7 +23,6 @@ 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; @@ -42,8 +41,8 @@ public final class ConcreteCreator { // Floor set at N due to use of Optional. @VisibleForTesting public static final int BUILD_CODE_FLOOR = Build.VERSION_CODES.N; - // Ceiling set at O_MR1 because this feature will ship as part of the framework in P. - @VisibleForTesting public static final int BUILD_CODE_CEILING = Build.VERSION_CODES.O_MR1; + // Ceiling set at P because this feature will ship as part of the framework in Q. + @VisibleForTesting public static final int BUILD_CODE_CEILING = 28; /** * Creates a new AssistedDialingMediator @@ -107,8 +106,7 @@ public final class ConcreteCreator { } return (Build.VERSION.SDK_INT >= BUILD_CODE_FLOOR - && Build.VERSION.SDK_INT <= BUILD_CODE_CEILING - && !BuildCompat.isAtLeastP()) + && Build.VERSION.SDK_INT <= BUILD_CODE_CEILING) && configProvider.getBoolean("assisted_dialing_enabled", false); } |