From 57fdc2b9ab68bff217d4c9c605ef89cefd66f678 Mon Sep 17 00:00:00 2001
From: calderwoodra <calderwoodra@google.com>
Date: Thu, 22 Mar 2018 01:06:19 -0700
Subject: Increase minSdk to 24.

Manually set to M
 - MissedCallNotifierTest (not sure what the issue is here...)
 - CallLogGroupBuilderTest (because a check was removed, some NPEs are thrown)
 - MainSearchControllerTest (/system/etc/fonts.xml (No such file or directory))

Ignore Tests
 - a few random ones in incallui/answer/impl/hint (shared prefs aren't working for some reason)
 - VisualVoicemailUpdateTaskTest (disabled the whole test, issue unclear)

Bug: 73902692
Test: tap
PiperOrigin-RevId: 190030202
Change-Id: I1e9b61d758a61582c5a183ee884dd2181d1c10de
---
 .../blockednumber/SystemBlockedNumberPhoneLookup.java        | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

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

diff --git a/java/com/android/dialer/phonelookup/blockednumber/SystemBlockedNumberPhoneLookup.java b/java/com/android/dialer/phonelookup/blockednumber/SystemBlockedNumberPhoneLookup.java
index a3d51a78f..fe6642eef 100644
--- a/java/com/android/dialer/phonelookup/blockednumber/SystemBlockedNumberPhoneLookup.java
+++ b/java/com/android/dialer/phonelookup/blockednumber/SystemBlockedNumberPhoneLookup.java
@@ -16,11 +16,8 @@
 
 package com.android.dialer.phonelookup.blockednumber;
 
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.database.Cursor;
-import android.os.Build.VERSION;
-import android.os.Build.VERSION_CODES;
 import android.provider.BlockedNumberContract.BlockedNumbers;
 import android.support.annotation.NonNull;
 import android.support.annotation.WorkerThread;
@@ -72,10 +69,7 @@ public class SystemBlockedNumberPhoneLookup implements PhoneLookup<SystemBlocked
     if (!FilteredNumberCompat.useNewFiltering(appContext)) {
       return Futures.immediateFuture(SystemBlockedNumberInfo.getDefaultInstance());
     }
-    return executorService.submit(
-        () -> {
-          return queryNumbers(ImmutableSet.of(number)).get(number);
-        });
+    return executorService.submit(() -> queryNumbers(ImmutableSet.of(number)).get(number));
   }
 
   @Override
@@ -96,7 +90,6 @@ public class SystemBlockedNumberPhoneLookup implements PhoneLookup<SystemBlocked
   }
 
   @WorkerThread
-  @TargetApi(VERSION_CODES.N)
   private ImmutableMap<DialerPhoneNumber, SystemBlockedNumberInfo> queryNumbers(
       ImmutableSet<DialerPhoneNumber> numbers) {
     Assert.isWorkerThread();
@@ -171,9 +164,6 @@ public class SystemBlockedNumberPhoneLookup implements PhoneLookup<SystemBlocked
 
   @Override
   public void registerContentObservers() {
-    if (VERSION.SDK_INT < VERSION_CODES.N) {
-      return;
-    }
     appContext
         .getContentResolver()
         .registerContentObserver(
-- 
cgit v1.2.3