diff options
| author | calderwoodra <calderwoodra@google.com> | 2018-03-22 01:06:19 -0700 |
|---|---|---|
| committer | Copybara-Service <copybara-piper@google.com> | 2018-03-26 22:15:06 -0700 |
| commit | 57fdc2b9ab68bff217d4c9c605ef89cefd66f678 (patch) | |
| tree | 8588b9122e464ebe64930271c766a3120ee5ac60 /java/com/android/dialer/phonelookup | |
| parent | 58d0b2a7cdd4b988f527f03a7cb4ba2a4b7cd145 (diff) | |
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
Diffstat (limited to 'java/com/android/dialer/phonelookup')
| -rw-r--r-- | java/com/android/dialer/phonelookup/blockednumber/SystemBlockedNumberPhoneLookup.java | 12 |
1 files changed, 1 insertions, 11 deletions
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( |