From 437ae9552cce7768068fa92663740711ee541417 Mon Sep 17 00:00:00 2001 From: linyuh Date: Mon, 26 Mar 2018 12:46:18 -0700 Subject: Remove obsolete version checks and compat utilities after min SDK was bumped up to N. Test: Existing tests PiperOrigin-RevId: 190508397 Change-Id: Ia5f33e45af1d1cc666fec5f43efa564b2b68c193 --- java/com/android/incallui/ringtone/DialerRingtoneManager.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'java/com/android/incallui/ringtone/DialerRingtoneManager.java') diff --git a/java/com/android/incallui/ringtone/DialerRingtoneManager.java b/java/com/android/incallui/ringtone/DialerRingtoneManager.java index 49badf575..b8a3071cc 100644 --- a/java/com/android/incallui/ringtone/DialerRingtoneManager.java +++ b/java/com/android/incallui/ringtone/DialerRingtoneManager.java @@ -18,8 +18,6 @@ package com.android.incallui.ringtone; import android.content.ContentResolver; import android.net.Uri; -import android.os.Build.VERSION; -import android.os.Build.VERSION_CODES; import android.provider.Settings; import android.support.annotation.NonNull; import android.support.annotation.Nullable; @@ -92,11 +90,9 @@ public class DialerRingtoneManager { } private boolean isDialerRingingEnabled() { - boolean enabledFlag = - isDialerRingingEnabledForTesting != null - ? isDialerRingingEnabledForTesting - : IS_DIALER_RINGING_ENABLED; - return VERSION.SDK_INT >= VERSION_CODES.N && enabledFlag; + return isDialerRingingEnabledForTesting != null + ? isDialerRingingEnabledForTesting + : IS_DIALER_RINGING_ENABLED; } /** -- cgit v1.2.3