Merge "Delete checkSpamStatusForInCallUi" (f928bd25) · Commits · e / os / android_packages_apps_Dialer

java/com/android/dialer/spam/Spam.java

+0 −13

Original line number	Diff line number	Diff line
		@@ -60,19 +60,6 @@ public interface Spam {
		*/
		ListenableFuture<SpamStatus> checkSpamStatus(String number, @Nullable String defaultCountryIso);

		/**
		* Checks if the given number is suspected of being spam, checking additional information as
		* needed for the in-call ui.
		*
		* <p>See {@link #checkSpamStatus(String, String)}.
		*
		* @param number the phone number.
		* @param defaultCountryIso the default country to use if it's not part of the number.
		* @return the {@link SpamStatus} for the given number.
		*/
		ListenableFuture<SpamStatus> checkSpamStatusForInCallUi(
		String number, @Nullable String defaultCountryIso);

		/**
		* Called as an indication that the Spam implementation should check whether downloading a spam
		* list needs to occur or not.

+0 −6

Original line number	Diff line number	Diff line
		@@ -67,12 +67,6 @@ public class SpamStub implements Spam {
		return Futures.immediateFuture(SimpleSpamStatus.notSpam());
		}

		@Override
		public ListenableFuture<SpamStatus> checkSpamStatusForInCallUi(
		String number, @Nullable String defaultCountryIso) {
		return checkSpamStatus(number, defaultCountryIso);
		}

		@Override
		public ListenableFuture<Void> updateSpamListDownload(boolean isEnabledByUser) {
		// no-op

+1 −3

Original line number	Diff line number	Diff line
		@@ -150,9 +150,7 @@ public class CallList implements DialerCallDelegate {
		if (SpamComponent.get(context).spamSettings().isSpamEnabled()) {
		String number = TelecomCallUtil.getNumber(telecomCall);
		ListenableFuture<SpamStatus> futureSpamStatus =
		SpamComponent.get(context)
		.spam()
		.checkSpamStatusForInCallUi(number, call.getCountryIso());
		SpamComponent.get(context).spam().checkSpamStatus(number, call.getCountryIso());

		Futures.addCallback(
		futureSpamStatus,