From 60c1e5732085d36bdf5b49055add832222c75839 Mon Sep 17 00:00:00 2001 From: linyuh Date: Thu, 28 Jun 2018 20:13:52 -0700 Subject: Remove redundant @TargetApi, @RequiresApi and @SuppressWarnings Test: Existing tests PiperOrigin-RevId: 202589482 Change-Id: I6982e4069d30032bf46caf3c9984dfc0e7196f6f --- java/com/android/dialer/app/calllog/CallLogAsyncTaskUtil.java | 3 --- .../dialer/app/calllog/CallLogNotificationsQueryHelper.java | 4 ---- .../android/dialer/app/voicemail/VoicemailPlaybackPresenter.java | 3 --- java/com/android/dialer/blocking/BlockedNumbersMigrator.java | 9 --------- .../android/dialer/blocking/FilteredNumberAsyncQueryHandler.java | 3 --- .../android/dialer/callcomposer/CopyAndResizeImageWorker.java | 3 --- .../android/dialer/callcomposer/camera/ImagePersistWorker.java | 3 --- java/com/android/dialer/callintent/CallIntent.java | 3 --- java/com/android/dialer/calllog/CallLogCacheUpdater.java | 1 - .../dialer/calllog/database/AnnotatedCallLogContentProvider.java | 3 --- .../datasources/systemcalllog/SystemCallLogDataSource.java | 5 ----- java/com/android/dialer/calllog/ui/NewCallLogFragment.java | 1 - .../android/dialer/databasepopulator/BlockedBumberPopulator.java | 4 ---- java/com/android/dialer/main/impl/OldMainActivityPeer.java | 1 - java/com/android/dialer/oem/CequintCallerIdManager.java | 3 --- .../android/dialer/persistentlog/PersistentLogFileHandler.java | 6 +----- .../dialer/phonelookup/cp2/Cp2DefaultDirectoryPhoneLookup.java | 1 - .../dialer/phonelookup/cp2/Cp2ExtendedDirectoryPhoneLookup.java | 1 - .../dialer/phonelookup/cp2/MissingPermissionsOperations.java | 1 - java/com/android/dialer/phonenumbercache/CallLogQuery.java | 4 ---- java/com/android/dialer/precall/impl/AssistedDialAction.java | 6 ------ java/com/android/dialer/promotion/PromotionManager.java | 1 - java/com/android/dialer/speeddial/SpeedDialAdapter.java | 4 ---- .../dialer/voicemail/listui/error/VoicemailStatusWorker.java | 3 --- .../com/android/dialer/voicemailstatus/VoicemailStatusQuery.java | 4 ---- 25 files changed, 1 insertion(+), 79 deletions(-) (limited to 'java/com/android/dialer') diff --git a/java/com/android/dialer/app/calllog/CallLogAsyncTaskUtil.java b/java/com/android/dialer/app/calllog/CallLogAsyncTaskUtil.java index b306e756a..f54ea79dc 100644 --- a/java/com/android/dialer/app/calllog/CallLogAsyncTaskUtil.java +++ b/java/com/android/dialer/app/calllog/CallLogAsyncTaskUtil.java @@ -16,13 +16,11 @@ package com.android.dialer.app.calllog; -import android.annotation.TargetApi; import android.content.ContentValues; import android.content.Context; import android.content.Intent; import android.net.Uri; import android.os.AsyncTask; -import android.os.Build.VERSION_CODES; import android.provider.CallLog; import android.provider.VoicemailContract.Voicemails; import android.support.annotation.NonNull; @@ -35,7 +33,6 @@ import com.android.dialer.util.PermissionsUtil; import com.android.voicemail.VoicemailClient; /** TODO(calderwoodra): documentation */ -@TargetApi(VERSION_CODES.N) public class CallLogAsyncTaskUtil { private static final String TAG = "CallLogAsyncTaskUtil"; diff --git a/java/com/android/dialer/app/calllog/CallLogNotificationsQueryHelper.java b/java/com/android/dialer/app/calllog/CallLogNotificationsQueryHelper.java index 152a3b837..03b824eb6 100644 --- a/java/com/android/dialer/app/calllog/CallLogNotificationsQueryHelper.java +++ b/java/com/android/dialer/app/calllog/CallLogNotificationsQueryHelper.java @@ -17,7 +17,6 @@ package com.android.dialer.app.calllog; import android.Manifest; -import android.annotation.TargetApi; import android.content.ContentResolver; import android.content.ContentUris; import android.content.ContentValues; @@ -51,7 +50,6 @@ import java.util.List; import java.util.concurrent.TimeUnit; /** Helper class operating on call log notifications. */ -@TargetApi(Build.VERSION_CODES.N) public class CallLogNotificationsQueryHelper { @VisibleForTesting @@ -349,14 +347,12 @@ public class CallLogNotificationsQueryHelper { @Override @Nullable - @TargetApi(Build.VERSION_CODES.N) public List query(int type) { return query(type, NO_THRESHOLD); } @Override @Nullable - @TargetApi(Build.VERSION_CODES.N) @SuppressWarnings("MissingPermission") public List query(int type, long thresholdMillis) { if (!PermissionsUtil.hasPermission(context, Manifest.permission.READ_CALL_LOG)) { diff --git a/java/com/android/dialer/app/voicemail/VoicemailPlaybackPresenter.java b/java/com/android/dialer/app/voicemail/VoicemailPlaybackPresenter.java index 6fc8d23e3..95662a1f6 100644 --- a/java/com/android/dialer/app/voicemail/VoicemailPlaybackPresenter.java +++ b/java/com/android/dialer/app/voicemail/VoicemailPlaybackPresenter.java @@ -16,7 +16,6 @@ package com.android.dialer.app.voicemail; -import android.annotation.TargetApi; import android.app.Activity; import android.content.ContentResolver; import android.content.ContentUris; @@ -28,7 +27,6 @@ import android.media.AudioManager; import android.media.MediaPlayer; import android.net.Uri; import android.os.AsyncTask; -import android.os.Build.VERSION_CODES; import android.os.Bundle; import android.os.Handler; import android.os.PowerManager; @@ -90,7 +88,6 @@ import javax.annotation.concurrent.ThreadSafe; * calls into this class from outside must be done from the main UI thread. */ @NotThreadSafe -@TargetApi(VERSION_CODES.N) public class VoicemailPlaybackPresenter implements MediaPlayer.OnPreparedListener, MediaPlayer.OnCompletionListener, diff --git a/java/com/android/dialer/blocking/BlockedNumbersMigrator.java b/java/com/android/dialer/blocking/BlockedNumbersMigrator.java index 101a04b2f..ef047a036 100644 --- a/java/com/android/dialer/blocking/BlockedNumbersMigrator.java +++ b/java/com/android/dialer/blocking/BlockedNumbersMigrator.java @@ -16,15 +16,12 @@ package com.android.dialer.blocking; -import android.annotation.TargetApi; import android.content.ContentResolver; import android.content.ContentValues; import android.content.Context; import android.database.Cursor; import android.os.AsyncTask; -import android.os.Build.VERSION_CODES; import android.provider.BlockedNumberContract.BlockedNumbers; -import android.support.annotation.RequiresApi; import com.android.dialer.common.LogUtil; import com.android.dialer.database.FilteredNumberContract; import com.android.dialer.database.FilteredNumberContract.FilteredNumber; @@ -35,7 +32,6 @@ import java.util.Objects; * Class which should be used to migrate numbers from {@link FilteredNumberContract} blocking to * {@link android.provider.BlockedNumberContract} blocking. */ -@TargetApi(VERSION_CODES.N) @Deprecated public class BlockedNumbersMigrator { @@ -49,8 +45,6 @@ public class BlockedNumbersMigrator { this.context = Objects.requireNonNull(context); } - @RequiresApi(VERSION_CODES.N) - @TargetApi(VERSION_CODES.N) private static boolean migrateToNewBlockingInBackground(ContentResolver resolver) { try (Cursor cursor = resolver.query( @@ -91,8 +85,6 @@ public class BlockedNumbersMigrator { } } - @RequiresApi(VERSION_CODES.N) - @TargetApi(VERSION_CODES.N) private static boolean isNumberInNewBlocking(ContentResolver resolver, String originalNumber) { try (Cursor cursor = resolver.query( @@ -134,7 +126,6 @@ public class BlockedNumbersMigrator { void onComplete(); } - @TargetApi(VERSION_CODES.N) private class MigratorTask extends AsyncTask { private final Listener listener; diff --git a/java/com/android/dialer/blocking/FilteredNumberAsyncQueryHandler.java b/java/com/android/dialer/blocking/FilteredNumberAsyncQueryHandler.java index b41759259..08526ef76 100644 --- a/java/com/android/dialer/blocking/FilteredNumberAsyncQueryHandler.java +++ b/java/com/android/dialer/blocking/FilteredNumberAsyncQueryHandler.java @@ -16,7 +16,6 @@ package com.android.dialer.blocking; -import android.annotation.TargetApi; import android.content.AsyncQueryHandler; import android.content.ContentValues; import android.content.Context; @@ -24,7 +23,6 @@ import android.database.Cursor; import android.database.DatabaseUtils; import android.database.sqlite.SQLiteDatabaseCorruptException; import android.net.Uri; -import android.os.Build.VERSION_CODES; import android.support.annotation.Nullable; import android.support.annotation.VisibleForTesting; import android.support.v4.os.UserManagerCompat; @@ -201,7 +199,6 @@ public class FilteredNumberAsyncQueryHandler extends AsyncQueryHandler { * * @return blocked id. */ - @TargetApi(VERSION_CODES.N) @Nullable public Integer getBlockedIdSynchronous(@Nullable String number, String countryIso) { Assert.isWorkerThread(); diff --git a/java/com/android/dialer/callcomposer/CopyAndResizeImageWorker.java b/java/com/android/dialer/callcomposer/CopyAndResizeImageWorker.java index 0f1ab5f25..540ef0fe6 100644 --- a/java/com/android/dialer/callcomposer/CopyAndResizeImageWorker.java +++ b/java/com/android/dialer/callcomposer/CopyAndResizeImageWorker.java @@ -16,14 +16,12 @@ package com.android.dialer.callcomposer; -import android.annotation.TargetApi; import android.content.Context; import android.graphics.Bitmap; import android.graphics.Bitmap.CompressFormat; import android.graphics.BitmapFactory; import android.media.ExifInterface; import android.net.Uri; -import android.os.Build.VERSION_CODES; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.v4.util.Pair; @@ -37,7 +35,6 @@ import java.io.InputStream; import java.io.OutputStream; /** Task for copying and resizing images to be shared with RCS process. */ -@TargetApi(VERSION_CODES.N) class CopyAndResizeImageWorker implements Worker> { private static final String MIME_TYPE = "image/jpeg"; diff --git a/java/com/android/dialer/callcomposer/camera/ImagePersistWorker.java b/java/com/android/dialer/callcomposer/camera/ImagePersistWorker.java index c18e22d56..27ad06899 100644 --- a/java/com/android/dialer/callcomposer/camera/ImagePersistWorker.java +++ b/java/com/android/dialer/callcomposer/camera/ImagePersistWorker.java @@ -16,12 +16,10 @@ package com.android.dialer.callcomposer.camera; -import android.annotation.TargetApi; import android.content.Context; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.net.Uri; -import android.os.Build.VERSION_CODES; import android.support.annotation.NonNull; import android.support.v4.content.FileProvider; import com.android.dialer.callcomposer.camera.ImagePersistWorker.Result; @@ -38,7 +36,6 @@ import java.io.IOException; import java.io.OutputStream; /** Persisting image routine. */ -@TargetApi(VERSION_CODES.N) public class ImagePersistWorker implements Worker { private int width; private int height; diff --git a/java/com/android/dialer/callintent/CallIntent.java b/java/com/android/dialer/callintent/CallIntent.java index ba61d5619..ef7aff672 100644 --- a/java/com/android/dialer/callintent/CallIntent.java +++ b/java/com/android/dialer/callintent/CallIntent.java @@ -198,7 +198,6 @@ public abstract class CallIntent implements Parcelable { return intent; } - @SuppressWarnings("AndroidApiChecker") // Use of Java 8 APIs. private Bundle createInCallUiIntentExtras() { Bundle bundle = new Bundle(); stringInCallUiIntentExtras().forEach(bundle::putString); @@ -207,7 +206,6 @@ public abstract class CallIntent implements Parcelable { return bundle; } - @SuppressWarnings("AndroidApiChecker") // Use of Java 8 APIs. private Bundle createPlaceCallExtras() { Bundle bundle = new Bundle(); stringPlaceCallExtras().forEach(bundle::putString); @@ -255,7 +253,6 @@ public abstract class CallIntent implements Parcelable { return 0; } - @SuppressWarnings("AndroidApiChecker") // Use of Java 8 APIs. @Override public void writeToParcel(Parcel dest, int flags) { dest.writeParcelable(number(), flags); diff --git a/java/com/android/dialer/calllog/CallLogCacheUpdater.java b/java/com/android/dialer/calllog/CallLogCacheUpdater.java index b3130e964..008e2ccda 100644 --- a/java/com/android/dialer/calllog/CallLogCacheUpdater.java +++ b/java/com/android/dialer/calllog/CallLogCacheUpdater.java @@ -46,7 +46,6 @@ import javax.inject.Inject; * Update {@link Calls#CACHED_NAME} and other cached columns after the annotated call log has been * updated. Dialer does not read these columns but other apps relies on it. */ -@SuppressWarnings("AndroidApiChecker") public final class CallLogCacheUpdater { private final Context appContext; diff --git a/java/com/android/dialer/calllog/database/AnnotatedCallLogContentProvider.java b/java/com/android/dialer/calllog/database/AnnotatedCallLogContentProvider.java index 36fa5ff26..ce41a2ab2 100644 --- a/java/com/android/dialer/calllog/database/AnnotatedCallLogContentProvider.java +++ b/java/com/android/dialer/calllog/database/AnnotatedCallLogContentProvider.java @@ -16,7 +16,6 @@ package com.android.dialer.calllog.database; -import android.annotation.TargetApi; import android.content.ContentProvider; import android.content.ContentProviderOperation; import android.content.ContentProviderResult; @@ -28,7 +27,6 @@ import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteQueryBuilder; import android.net.Uri; -import android.os.Build; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import com.android.dialer.calllog.database.AnnotatedCallLogConstraints.Operation; @@ -82,7 +80,6 @@ public class AnnotatedCallLogContentProvider extends ContentProvider { return true; } - @TargetApi(Build.VERSION_CODES.N) // Uses try-with-resources @Nullable @Override public Cursor query( diff --git a/java/com/android/dialer/calllog/datasources/systemcalllog/SystemCallLogDataSource.java b/java/com/android/dialer/calllog/datasources/systemcalllog/SystemCallLogDataSource.java index 7a12bc4ba..3e123c962 100644 --- a/java/com/android/dialer/calllog/datasources/systemcalllog/SystemCallLogDataSource.java +++ b/java/com/android/dialer/calllog/datasources/systemcalllog/SystemCallLogDataSource.java @@ -17,12 +17,10 @@ package com.android.dialer.calllog.datasources.systemcalllog; import android.Manifest.permission; -import android.annotation.TargetApi; import android.content.ContentValues; import android.content.Context; import android.content.SharedPreferences; import android.database.Cursor; -import android.os.Build; import android.os.Build.VERSION; import android.os.Build.VERSION_CODES; import android.provider.CallLog; @@ -230,7 +228,6 @@ public class SystemCallLogDataSource implements CallLogDataSource { return null; } - @TargetApi(Build.VERSION_CODES.N) // Uses try-with-resources private void handleInsertsAndUpdates( Context appContext, CallLogMutations mutations, Set existingAnnotatedCallLogIds) { long previousTimestampProcessed = sharedPreferences.getLong(PREF_LAST_TIMESTAMP_PROCESSED, 0L); @@ -453,7 +450,6 @@ public class SystemCallLogDataSource implements CallLogDataSource { } } - @TargetApi(Build.VERSION_CODES.N) // Uses try-with-resources private static Set getAnnotatedCallLogIds(Context appContext) { ArraySet ids = new ArraySet<>(); @@ -482,7 +478,6 @@ public class SystemCallLogDataSource implements CallLogDataSource { return ids; } - @TargetApi(Build.VERSION_CODES.N) // Uses try-with-resources private static Set getIdsFromSystemCallLogThatMatch( Context appContext, Set matchingIds) { ArraySet ids = new ArraySet<>(); diff --git a/java/com/android/dialer/calllog/ui/NewCallLogFragment.java b/java/com/android/dialer/calllog/ui/NewCallLogFragment.java index 5e72a1af3..62f99b6e6 100644 --- a/java/com/android/dialer/calllog/ui/NewCallLogFragment.java +++ b/java/com/android/dialer/calllog/ui/NewCallLogFragment.java @@ -293,7 +293,6 @@ public final class NewCallLogFragment extends Fragment implements LoaderCallback return new AnnotatedCallLogCursorLoader(Assert.isNotNull(getContext())); } - @SuppressWarnings("AndroidApiChecker") // Use of optional @Override public void onLoadFinished(Loader loader, Cursor newCursor) { LogUtil.enterBlock("NewCallLogFragment.onLoadFinished"); diff --git a/java/com/android/dialer/databasepopulator/BlockedBumberPopulator.java b/java/com/android/dialer/databasepopulator/BlockedBumberPopulator.java index 378d487e2..0819d52f6 100644 --- a/java/com/android/dialer/databasepopulator/BlockedBumberPopulator.java +++ b/java/com/android/dialer/databasepopulator/BlockedBumberPopulator.java @@ -16,12 +16,10 @@ package com.android.dialer.databasepopulator; -import android.annotation.TargetApi; import android.content.ContentProviderOperation; import android.content.ContentValues; import android.content.Context; import android.content.OperationApplicationException; -import android.os.Build.VERSION_CODES; import android.os.RemoteException; import android.provider.BlockedNumberContract; import android.provider.BlockedNumberContract.BlockedNumbers; @@ -38,7 +36,6 @@ public class BlockedBumberPopulator { Arrays.asList( createContentValuesWithNumber("123456789"), createContentValuesWithNumber("987654321")); - @TargetApi(VERSION_CODES.N) public static void populateBlockedNumber(@NonNull Context context) { ArrayList operations = new ArrayList<>(); for (ContentValues value : values) { @@ -55,7 +52,6 @@ public class BlockedBumberPopulator { } } - @TargetApi(VERSION_CODES.N) public static void deleteBlockedNumbers(@NonNull Context context) { // clean BlockedNumbers db context.getContentResolver().delete(BlockedNumbers.CONTENT_URI, null, null); diff --git a/java/com/android/dialer/main/impl/OldMainActivityPeer.java b/java/com/android/dialer/main/impl/OldMainActivityPeer.java index 73bb4f81a..feb76acd7 100644 --- a/java/com/android/dialer/main/impl/OldMainActivityPeer.java +++ b/java/com/android/dialer/main/impl/OldMainActivityPeer.java @@ -1371,7 +1371,6 @@ public class OldMainActivityPeer implements MainActivityPeer, FragmentUtilListen showPromotionBottomSheet(activity, bottomSheet); } - @SuppressWarnings("AndroidApiChecker") // Use of optional private static void showPromotionBottomSheet(Context context, View view) { BottomSheetBehavior bottomSheetBehavior = BottomSheetBehavior.from(view); Optional promotionOptional = diff --git a/java/com/android/dialer/oem/CequintCallerIdManager.java b/java/com/android/dialer/oem/CequintCallerIdManager.java index ea6cbb8cb..da217c883 100644 --- a/java/com/android/dialer/oem/CequintCallerIdManager.java +++ b/java/com/android/dialer/oem/CequintCallerIdManager.java @@ -15,12 +15,10 @@ */ package com.android.dialer.oem; -import android.annotation.TargetApi; import android.content.Context; import android.content.pm.PackageManager; import android.database.Cursor; import android.net.Uri; -import android.os.Build.VERSION_CODES; import android.support.annotation.AnyThread; import android.support.annotation.NonNull; import android.support.annotation.Nullable; @@ -43,7 +41,6 @@ import java.util.concurrent.ConcurrentHashMap; * Cequint Caller ID. It also caches any information fetched in static map, which lives through * whole application lifecycle. */ -@TargetApi(VERSION_CODES.N) public class CequintCallerIdManager { @VisibleForTesting diff --git a/java/com/android/dialer/persistentlog/PersistentLogFileHandler.java b/java/com/android/dialer/persistentlog/PersistentLogFileHandler.java index a6067d368..5f3922265 100644 --- a/java/com/android/dialer/persistentlog/PersistentLogFileHandler.java +++ b/java/com/android/dialer/persistentlog/PersistentLogFileHandler.java @@ -16,10 +16,8 @@ package com.android.dialer.persistentlog; -import android.annotation.TargetApi; import android.content.Context; import android.content.SharedPreferences; -import android.os.Build.VERSION_CODES; import android.preference.PreferenceManager; import android.support.annotation.AnyThread; import android.support.annotation.MainThread; @@ -52,8 +50,6 @@ import java.util.List; *

This class is NOT thread safe. All methods expect the constructor must be called on the same * worker thread. */ -@SuppressWarnings("AndroidApiChecker") // lambdas -@TargetApi(VERSION_CODES.N) final class PersistentLogFileHandler { private static final String LOG_DIRECTORY = "persistent_log"; @@ -67,7 +63,7 @@ final class PersistentLogFileHandler { public LogCorruptionException(String message) { super(message); } - }; + } private File logDirectory; private final String subfolder; diff --git a/java/com/android/dialer/phonelookup/cp2/Cp2DefaultDirectoryPhoneLookup.java b/java/com/android/dialer/phonelookup/cp2/Cp2DefaultDirectoryPhoneLookup.java index 2e6bcde51..7f2d91a5d 100644 --- a/java/com/android/dialer/phonelookup/cp2/Cp2DefaultDirectoryPhoneLookup.java +++ b/java/com/android/dialer/phonelookup/cp2/Cp2DefaultDirectoryPhoneLookup.java @@ -64,7 +64,6 @@ import java.util.function.Predicate; import javax.inject.Inject; /** PhoneLookup implementation for contacts in the default directory. */ -@SuppressWarnings("AndroidApiChecker") // Use of Java 8 APIs. public final class Cp2DefaultDirectoryPhoneLookup implements PhoneLookup { private static final String PREF_LAST_TIMESTAMP_PROCESSED = diff --git a/java/com/android/dialer/phonelookup/cp2/Cp2ExtendedDirectoryPhoneLookup.java b/java/com/android/dialer/phonelookup/cp2/Cp2ExtendedDirectoryPhoneLookup.java index bbbd18664..237ae5eb0 100644 --- a/java/com/android/dialer/phonelookup/cp2/Cp2ExtendedDirectoryPhoneLookup.java +++ b/java/com/android/dialer/phonelookup/cp2/Cp2ExtendedDirectoryPhoneLookup.java @@ -55,7 +55,6 @@ import javax.inject.Inject; * *

Contacts in these directories are accessible only by specifying a directory ID. */ -@SuppressWarnings("AndroidApiChecker") // Use of Java 8 APIs. public final class Cp2ExtendedDirectoryPhoneLookup implements PhoneLookup { /** Config flag for timeout (in ms). */ diff --git a/java/com/android/dialer/phonelookup/cp2/MissingPermissionsOperations.java b/java/com/android/dialer/phonelookup/cp2/MissingPermissionsOperations.java index e7776108e..a241368e9 100644 --- a/java/com/android/dialer/phonelookup/cp2/MissingPermissionsOperations.java +++ b/java/com/android/dialer/phonelookup/cp2/MissingPermissionsOperations.java @@ -36,7 +36,6 @@ import java.util.function.Predicate; import javax.inject.Inject; /** Shared logic for handling missing permissions in CP2 lookups. */ -@SuppressWarnings("AndroidApiChecker") // Use of Java 8 APIs. final class MissingPermissionsOperations { private final Context appContext; diff --git a/java/com/android/dialer/phonenumbercache/CallLogQuery.java b/java/com/android/dialer/phonenumbercache/CallLogQuery.java index 488aa26e5..2f2758a40 100644 --- a/java/com/android/dialer/phonenumbercache/CallLogQuery.java +++ b/java/com/android/dialer/phonenumbercache/CallLogQuery.java @@ -53,11 +53,7 @@ public final class CallLogQuery { public static final int DATA_USAGE = 21; public static final int TRANSCRIPTION = 22; public static final int CACHED_PHOTO_URI = 23; - - @RequiresApi(VERSION_CODES.N) public static final int POST_DIAL_DIGITS = 24; - - @RequiresApi(VERSION_CODES.N) public static final int VIA_NUMBER = 25; @RequiresApi(VERSION_CODES.O) diff --git a/java/com/android/dialer/precall/impl/AssistedDialAction.java b/java/com/android/dialer/precall/impl/AssistedDialAction.java index 40a810b5b..0e38231af 100644 --- a/java/com/android/dialer/precall/impl/AssistedDialAction.java +++ b/java/com/android/dialer/precall/impl/AssistedDialAction.java @@ -16,9 +16,7 @@ package com.android.dialer.precall.impl; -import android.annotation.TargetApi; import android.content.Context; -import android.os.Build; import android.os.Bundle; import android.telecom.PhoneAccount; import android.telephony.SubscriptionInfo; @@ -46,8 +44,6 @@ public class AssistedDialAction implements PreCallAction { return false; } - @SuppressWarnings("AndroidApiChecker") // Use of optional - @TargetApi(Build.VERSION_CODES.N) @Override public void runWithoutUi(Context context, CallIntentBuilder builder) { if (!builder.isAssistedDialAllowed()) { @@ -85,8 +81,6 @@ public class AssistedDialAction implements PreCallAction { /** * A convenience method to return the proper TelephonyManager in possible multi-sim environments. */ - @SuppressWarnings("AndroidApiChecker") // Use of createForSubscriptionId - @TargetApi(Build.VERSION_CODES.N) private TelephonyManager getAssistedDialingTelephonyManager( Context context, CallIntentBuilder builder) { diff --git a/java/com/android/dialer/promotion/PromotionManager.java b/java/com/android/dialer/promotion/PromotionManager.java index a86a745ad..24830defd 100644 --- a/java/com/android/dialer/promotion/PromotionManager.java +++ b/java/com/android/dialer/promotion/PromotionManager.java @@ -49,7 +49,6 @@ public final class PromotionManager { * *

TODO(wangqi): add support for other tabs. */ - @SuppressWarnings("AndroidApiChecker") // Use of optional public Optional getHighestPriorityPromotion(@PromotionType int type) { for (Promotion promotion : priorityPromotionList) { if (promotion.isEligibleToBeShown()) { diff --git a/java/com/android/dialer/speeddial/SpeedDialAdapter.java b/java/com/android/dialer/speeddial/SpeedDialAdapter.java index 4a48b6504..1bc072b5b 100644 --- a/java/com/android/dialer/speeddial/SpeedDialAdapter.java +++ b/java/com/android/dialer/speeddial/SpeedDialAdapter.java @@ -16,9 +16,7 @@ package com.android.dialer.speeddial; -import android.annotation.TargetApi; import android.content.Context; -import android.os.Build.VERSION_CODES; import android.support.annotation.IntDef; import android.support.annotation.NonNull; import android.support.annotation.Nullable; @@ -57,8 +55,6 @@ import java.util.Map; *

  • Suggested contacts * */ -@SuppressWarnings("AndroidApiChecker") -@TargetApi(VERSION_CODES.N) public final class SpeedDialAdapter extends RecyclerView.Adapter implements ItemTouchHelperAdapter { diff --git a/java/com/android/dialer/voicemail/listui/error/VoicemailStatusWorker.java b/java/com/android/dialer/voicemail/listui/error/VoicemailStatusWorker.java index e87dee3b0..08fef8e47 100644 --- a/java/com/android/dialer/voicemail/listui/error/VoicemailStatusWorker.java +++ b/java/com/android/dialer/voicemail/listui/error/VoicemailStatusWorker.java @@ -16,10 +16,8 @@ package com.android.dialer.voicemail.listui.error; -import android.annotation.TargetApi; import android.content.Context; import android.database.Cursor; -import android.os.Build.VERSION_CODES; import android.provider.VoicemailContract.Status; import android.support.annotation.Nullable; import com.android.dialer.common.concurrent.DialerExecutor.Worker; @@ -32,7 +30,6 @@ import java.util.List; /** * Worker for {@link com.android.dialer.common.concurrent.DialerExecutors} to fetch voicemail status */ -@TargetApi(VERSION_CODES.N) public class VoicemailStatusWorker implements Worker> { @Nullable diff --git a/java/com/android/dialer/voicemailstatus/VoicemailStatusQuery.java b/java/com/android/dialer/voicemailstatus/VoicemailStatusQuery.java index 8923f7411..7264afee1 100644 --- a/java/com/android/dialer/voicemailstatus/VoicemailStatusQuery.java +++ b/java/com/android/dialer/voicemailstatus/VoicemailStatusQuery.java @@ -34,11 +34,7 @@ public class VoicemailStatusQuery { public static final int CONFIGURATION_STATE_INDEX = 3; public static final int DATA_CHANNEL_STATE_INDEX = 4; public static final int NOTIFICATION_CHANNEL_STATE_INDEX = 5; - - @RequiresApi(VERSION_CODES.N) public static final int QUOTA_OCCUPIED_INDEX = 6; - - @RequiresApi(VERSION_CODES.N) public static final int QUOTA_TOTAL_INDEX = 7; @RequiresApi(VERSION_CODES.N_MR1) -- cgit v1.2.3