commit 7299b00d169100e5ac21a48e9bb11b9d944c7916
author maxwelb <maxwelb@google.com> Tue Jun 12 11:40:38 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Tue Jun 12 13:28:28 2018 -0700
tree 8924b399a421aeba3fad67d96aa89546c10e2bea
parent 30ab0e91d4bcc752b982c4620f823ff084e3210a

Delete checkSpamStatusForInCallUi

Test: Tap
PiperOrigin-RevId: 200252072
Change-Id: I25aea0e324b070d0f8553cb0041c6b3e9668552e

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

diff --git a/java/com/android/dialer/spam/Spam.java b/java/com/android/dialer/spam/Spam.java
index b797ce3..028bda4 100644
--- a/java/com/android/dialer/spam/Spam.java
+++ b/java/com/android/dialer/spam/Spam.java
@@ -61,19 +61,6 @@
   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.
    *

java/com/android/dialer/spam/stub/SpamStub.java

diff --git a/java/com/android/dialer/spam/stub/SpamStub.java b/java/com/android/dialer/spam/stub/SpamStub.java
index 7d48ca6..5eeed45 100644
--- a/java/com/android/dialer/spam/stub/SpamStub.java
+++ b/java/com/android/dialer/spam/stub/SpamStub.java
@@ -68,12 +68,6 @@
   }
 
   @Override
-  public ListenableFuture<SpamStatus> checkSpamStatusForInCallUi(
-      String number, @Nullable String defaultCountryIso) {
-    return checkSpamStatus(number, defaultCountryIso);
-  }
-
-  @Override
   public ListenableFuture<Void> updateSpamListDownload(boolean isEnabledByUser) {
     // no-op
     return Futures.immediateFuture(null);

java/com/android/incallui/call/CallList.java

diff --git a/java/com/android/incallui/call/CallList.java b/java/com/android/incallui/call/CallList.java
index 31afe71..634a302 100644
--- a/java/com/android/incallui/call/CallList.java
+++ b/java/com/android/incallui/call/CallList.java
@@ -150,9 +150,7 @@
     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,