diff options
| author | linyuh <linyuh@google.com> | 2018-06-26 10:33:34 -0700 |
|---|---|---|
| committer | Copybara-Service <copybara-piper@google.com> | 2018-06-27 11:05:43 -0700 |
| commit | de53e545276c7854de0d2886a6cb8c849b3b1e62 (patch) | |
| tree | 72e4b2eea356e41ac0b87f20e119d020ad6aa435 /java/com/android/dialer/assisteddialing/ConcreteCreator.java | |
| parent | cae28c6d5c04a79fb058043ce0c3e043e610309a (diff) | |
Remove redundant version checks and annotations in the assisted dialing package.
Test: Existing tests
PiperOrigin-RevId: 202151952
Change-Id: I0c1ad7b35ec1a57ae9f5d51ba935bfcd9f529379
Diffstat (limited to 'java/com/android/dialer/assisteddialing/ConcreteCreator.java')
| -rw-r--r-- | java/com/android/dialer/assisteddialing/ConcreteCreator.java | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/java/com/android/dialer/assisteddialing/ConcreteCreator.java b/java/com/android/dialer/assisteddialing/ConcreteCreator.java index 050774340..ab8ea70a7 100644 --- a/java/com/android/dialer/assisteddialing/ConcreteCreator.java +++ b/java/com/android/dialer/assisteddialing/ConcreteCreator.java @@ -16,13 +16,11 @@ package com.android.dialer.assisteddialing; -import android.annotation.TargetApi; import android.content.Context; import android.os.Build; 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.UserManagerCompat; import android.telephony.TelephonyManager; import com.android.dialer.common.LogUtil; @@ -36,13 +34,10 @@ import com.android.dialer.strictmode.StrictModeUtils; * <p>This helps keep the dependencies required by AssistedDialingMediator for assisted dialing * explicit. */ -@TargetApi(VERSION_CODES.N) 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 P because this feature will ship as part of the framework in Q. - @VisibleForTesting public static final int BUILD_CODE_CEILING = 28; + public static final int BUILD_CODE_CEILING = VERSION_CODES.P; /** * Creates a new AssistedDialingMediator @@ -105,8 +100,7 @@ public final class ConcreteCreator { throw new NullPointerException("Provided configProvider was null"); } - return (Build.VERSION.SDK_INT >= BUILD_CODE_FLOOR - && Build.VERSION.SDK_INT <= BUILD_CODE_CEILING) + return Build.VERSION.SDK_INT <= BUILD_CODE_CEILING && configProvider.getBoolean("assisted_dialing_enabled", false); } |