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/incallui/CallButtonPresenter.java | 5 +---- java/com/android/incallui/CallerInfo.java | 3 --- java/com/android/incallui/CallerInfoAsyncQuery.java | 3 --- java/com/android/incallui/answer/impl/hint/PawImageLoaderImpl.java | 3 --- java/com/android/incallui/call/DialerCall.java | 2 +- java/com/android/incallui/legacyblocking/DeleteBlockedCallTask.java | 3 --- java/com/android/incallui/spam/SpamCallListListener.java | 3 --- 7 files changed, 2 insertions(+), 20 deletions(-) (limited to 'java/com/android/incallui') diff --git a/java/com/android/incallui/CallButtonPresenter.java b/java/com/android/incallui/CallButtonPresenter.java index 274071a19..be803430b 100644 --- a/java/com/android/incallui/CallButtonPresenter.java +++ b/java/com/android/incallui/CallButtonPresenter.java @@ -16,9 +16,7 @@ package com.android.incallui; -import android.annotation.TargetApi; import android.content.Context; -import android.os.Build.VERSION_CODES; import android.os.Bundle; import android.os.Trace; import android.support.v4.app.Fragment; @@ -445,8 +443,7 @@ public class CallButtonPresenter * * @param call The active call. */ - @TargetApi(VERSION_CODES.N) - @SuppressWarnings(value = {"MissingPermission", "AndroidApiChecker"}) // Java 8 APIs. + @SuppressWarnings(value = {"MissingPermission"}) private void updateButtonsState(DialerCall call) { LogUtil.v("CallButtonPresenter.updateButtonsState", ""); final boolean isVideo = call.isVideoCall(); diff --git a/java/com/android/incallui/CallerInfo.java b/java/com/android/incallui/CallerInfo.java index 817535f52..3ab3a77d1 100644 --- a/java/com/android/incallui/CallerInfo.java +++ b/java/com/android/incallui/CallerInfo.java @@ -21,14 +21,12 @@ import android.database.Cursor; import android.graphics.Bitmap; import android.graphics.drawable.Drawable; import android.net.Uri; -import android.os.Build.VERSION_CODES; import android.provider.ContactsContract; import android.provider.ContactsContract.CommonDataKinds.Phone; import android.provider.ContactsContract.Contacts; import android.provider.ContactsContract.Data; import android.provider.ContactsContract.PhoneLookup; import android.provider.ContactsContract.RawContacts; -import android.support.annotation.RequiresApi; import android.telephony.PhoneNumberUtils; import android.text.TextUtils; import com.android.contacts.common.ContactsUtils; @@ -46,7 +44,6 @@ public class CallerInfo { private static final String TAG = "CallerInfo"; - @RequiresApi(VERSION_CODES.N) private static final String[] DEFAULT_PHONELOOKUP_PROJECTION = new String[] { PhoneLookup.CONTACT_ID, diff --git a/java/com/android/incallui/CallerInfoAsyncQuery.java b/java/com/android/incallui/CallerInfoAsyncQuery.java index 0ac252acf..35011cb67 100644 --- a/java/com/android/incallui/CallerInfoAsyncQuery.java +++ b/java/com/android/incallui/CallerInfoAsyncQuery.java @@ -17,14 +17,12 @@ package com.android.incallui; import android.Manifest; -import android.annotation.TargetApi; import android.content.AsyncQueryHandler; import android.content.ContentResolver; import android.content.Context; import android.database.Cursor; import android.database.SQLException; import android.net.Uri; -import android.os.Build.VERSION_CODES; import android.os.Handler; import android.os.Looper; import android.os.Message; @@ -51,7 +49,6 @@ import java.util.Arrays; * * @see CallerInfo */ -@TargetApi(VERSION_CODES.N) public class CallerInfoAsyncQuery { /** Interface for a CallerInfoAsyncQueryHandler result return. */ diff --git a/java/com/android/incallui/answer/impl/hint/PawImageLoaderImpl.java b/java/com/android/incallui/answer/impl/hint/PawImageLoaderImpl.java index aef56872a..6e91307f9 100644 --- a/java/com/android/incallui/answer/impl/hint/PawImageLoaderImpl.java +++ b/java/com/android/incallui/answer/impl/hint/PawImageLoaderImpl.java @@ -16,11 +16,9 @@ package com.android.incallui.answer.impl.hint; -import android.annotation.TargetApi; import android.content.Context; import android.content.SharedPreferences; import android.graphics.drawable.Drawable; -import android.os.Build.VERSION_CODES; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import com.android.dialer.common.Assert; @@ -29,7 +27,6 @@ import com.android.dialer.storage.StorageComponent; import com.android.incallui.answer.impl.hint.PawSecretCodeListener.PawType; /** Decrypt the event payload to be shown if in a specific time range and the key is received. */ -@TargetApi(VERSION_CODES.N) public final class PawImageLoaderImpl implements PawImageLoader { @Override diff --git a/java/com/android/incallui/call/DialerCall.java b/java/com/android/incallui/call/DialerCall.java index 94724e6b2..1f4e49ad8 100644 --- a/java/com/android/incallui/call/DialerCall.java +++ b/java/com/android/incallui/call/DialerCall.java @@ -1022,7 +1022,7 @@ public class DialerCall implements VideoTechListener, StateChangedListener, Capa * the same time that is logged as the start time in the Call Log (see {@link * android.provider.CallLog.Calls#DATE}). */ - @TargetApi(26) + @TargetApi(VERSION_CODES.O) public long getCreationTimeMillis() { return telecomCall.getDetails().getCreationTimeMillis(); } diff --git a/java/com/android/incallui/legacyblocking/DeleteBlockedCallTask.java b/java/com/android/incallui/legacyblocking/DeleteBlockedCallTask.java index f9fe6a68a..309e99405 100644 --- a/java/com/android/incallui/legacyblocking/DeleteBlockedCallTask.java +++ b/java/com/android/incallui/legacyblocking/DeleteBlockedCallTask.java @@ -17,12 +17,10 @@ package com.android.incallui.legacyblocking; import android.Manifest.permission; -import android.annotation.TargetApi; import android.content.Context; import android.content.pm.PackageManager; import android.database.Cursor; import android.os.AsyncTask; -import android.os.Build.VERSION_CODES; import android.provider.CallLog; import android.support.v4.content.ContextCompat; import com.android.dialer.common.LogUtil; @@ -34,7 +32,6 @@ import java.util.Objects; * versions of the OS, call blocking is implemented in the system and there's no need to mess with * the call log. */ -@TargetApi(VERSION_CODES.N) public class DeleteBlockedCallTask extends AsyncTask { public static final String IDENTIFIER = "DeleteBlockedCallTask"; diff --git a/java/com/android/incallui/spam/SpamCallListListener.java b/java/com/android/incallui/spam/SpamCallListListener.java index 3b2f1c519..7fd41f971 100644 --- a/java/com/android/incallui/spam/SpamCallListListener.java +++ b/java/com/android/incallui/spam/SpamCallListListener.java @@ -16,7 +16,6 @@ package com.android.incallui.spam; -import android.annotation.TargetApi; import android.app.Notification; import android.app.Notification.Builder; import android.app.PendingIntent; @@ -25,7 +24,6 @@ import android.content.Intent; import android.database.Cursor; import android.database.sqlite.SQLiteException; import android.graphics.drawable.Icon; -import android.os.Build.VERSION_CODES; import android.provider.CallLog; import android.provider.CallLog.Calls; import android.support.annotation.NonNull; @@ -88,7 +86,6 @@ public class SpamCallListListener implements CallList.Listener { } /** Checks if the number is in the call history. */ - @TargetApi(VERSION_CODES.N) private static final class NumberInCallHistoryWorker implements Worker { private final Context appContext; -- cgit v1.2.3