1 files changed, 4 insertions, 22 deletions

diff --git a/java/com/android/dialer/blocking/FilteredNumberCompat.java b/java/com/android/dialer/blocking/FilteredNumberCompat.java
index bea84e8db..b0af45c97 100644
--- a/java/com/android/dialer/blocking/FilteredNumberCompat.java
+++ b/java/com/android/dialer/blocking/FilteredNumberCompat.java
@@ -16,16 +16,12 @@
 
 package com.android.dialer.blocking;
 
-import android.annotation.TargetApi;
 import android.app.FragmentManager;
 import android.content.ContentUris;
 import android.content.ContentValues;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
-import android.os.Build.VERSION;
-import android.os.Build.VERSION_CODES;
-import android.os.UserManager;
 import android.preference.PreferenceManager;
 import android.provider.BlockedNumberContract;
 import android.provider.BlockedNumberContract.BlockedNumbers;
@@ -110,7 +106,7 @@ public class FilteredNumberCompat {
    *     otherwise.
    */
   public static boolean canUseNewFiltering() {
-    return VERSION.SDK_INT >= VERSION_CODES.N;
+    return true;
   }
 
   /**
@@ -162,16 +158,14 @@ public class FilteredNumberCompat {
 
   private static Uri getBaseUri(Context context) {
     // Explicit version check to aid static analysis
-    return useNewFiltering(context) && VERSION.SDK_INT >= VERSION_CODES.N
-        ? BlockedNumbers.CONTENT_URI
-        : FilteredNumber.CONTENT_URI;
+    return useNewFiltering(context) ? BlockedNumbers.CONTENT_URI : FilteredNumber.CONTENT_URI;
   }
 
   /**
    * Removes any null column names from the given projection array. This method is intended to be
    * used to strip out any column names that aren't available in every version of number blocking.
    * Example: {@literal getContext().getContentResolver().query( someUri, // Filtering ensures that
-   * no non-existant columns are queried FilteredNumberCompat.filter(new String[]
+   * no non-existent columns are queried FilteredNumberCompat.filter(new String[]
    * {FilteredNumberCompat.getIdColumnName(), FilteredNumberCompat.getTypeColumnName()},
    * FilteredNumberCompat.getE164NumberColumnName() + " = ?", new String[] {e164Number}); }
    *
@@ -249,9 +243,7 @@ public class FilteredNumberCompat {
    */
   public static Intent createManageBlockedNumbersIntent(Context context) {
     // Explicit version check to aid static analysis
-    if (canUseNewFiltering()
-        && hasMigratedToNewBlocking(context)
-        && VERSION.SDK_INT >= VERSION_CODES.N) {
+    if (canUseNewFiltering() && hasMigratedToNewBlocking(context)) {
       return context.getSystemService(TelecomManager.class).createManageBlockedNumbersIntent();
     }
     Intent intent = new Intent("com.android.dialer.action.BLOCKED_NUMBERS_SETTINGS");
@@ -270,11 +262,6 @@ public class FilteredNumberCompat {
       return canAttemptBlockOperationsForTest;
     }
 
-    if (VERSION.SDK_INT < VERSION_CODES.N) {
-      // Dialer blocking, must be primary user
-      return context.getSystemService(UserManager.class).isSystemUser();
-    }
-
     // Great Wall blocking, must be primary user and the default or system dialer
     // TODO(maxwelb): check that we're the system Dialer
     return TelecomUtil.isDefaultDialer(context)
@@ -294,10 +281,6 @@ public class FilteredNumberCompat {
    *     otherwise.
    */
   public static boolean canCurrentUserOpenBlockSettings(Context context) {
-    if (VERSION.SDK_INT < VERSION_CODES.N) {
-      // Dialer blocking, must be primary user
-      return context.getSystemService(UserManager.class).isSystemUser();
-    }
     // BlockedNumberContract blocking, verify through Contract API
     return TelecomUtil.isDefaultDialer(context)
         && safeBlockedNumbersContractCanCurrentUserBlockNumbers(context);
@@ -312,7 +295,6 @@ public class FilteredNumberCompat {
    * @return the result of BlockedNumberContract#canCurrentUserBlockNumbers, or {@code false} if an
    *     exception was thrown.
    */
-  @TargetApi(VERSION_CODES.N)
   private static boolean safeBlockedNumbersContractCanCurrentUserBlockNumbers(Context context) {
     try {
       return BlockedNumberContract.canCurrentUserBlockNumbers(context);