Merge "Remove redundant @TargetApi, @RequiresApi and @SuppressWarnings" (128ede2a) · Commits · e / os / android_packages_apps_Dialer

java/com/android/dialer/app/calllog/CallLogAsyncTaskUtil.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -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";

java/com/android/dialer/app/calllog/CallLogNotificationsQueryHelper.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -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<NewCall> query(int type) {
		return query(type, NO_THRESHOLD);
		}

		@Override
		@Nullable
		@TargetApi(Build.VERSION_CODES.N)
		@SuppressWarnings("MissingPermission")
		public List<NewCall> query(int type, long thresholdMillis) {
		if (!PermissionsUtil.hasPermission(context, Manifest.permission.READ_CALL_LOG)) {

java/com/android/dialer/app/voicemail/VoicemailPlaybackPresenter.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -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,

java/com/android/dialer/blocking/BlockedNumbersMigrator.java

+0 −9

Original line number	Diff line number	Diff line
		@@ -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<Void, Void, Boolean> {

		private final Listener listener;

java/com/android/dialer/blocking/FilteredNumberAsyncQueryHandler.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -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();