Merge changes Ia54e3421,Id2176e6e,I0311770e,I79f99c34,I8579afff, ...

* changes:
  Add some annotations that won't influence aosp.
  Update answer button logic.
  Hide new after call spam blocking promo behind an additional flag.
  Allow the TextView for call log primary text to adjust size when recycled.
  Format callback phone number.
  Added getLoggingName() to CallLogDataSource and PhoneLookup interfaces.
  Do not show bubble for outgoing call if it's not a background call.
  Always fetch status onResume and add logging for voicemail status in OldMainPeer and
  Place Duo calls with PreCall
  Creating CallIntent, AutoValue builder, to replace CallIntentBuilder.
  Set the DisplayNameSource to PHONE in DefaultLookupUriGenerator.
  Config correct layout boundaries to accommodate long text (call log & bottom sheet)
  Use info from EmergencyPhoneLookup to render UI for an emergency number.
  Implement EmergencyPhoneLookup for checking if a number is an emergency number.
  Add GlobalSpamListStatus and UserSpamListStatus
  Move SpamStatus classes into subpackage
  Delete obsolete checkSpamStatus(Listener) API
  Update callers of checkSpamStatus to use Future based API
  Fix bug that showing block option for private number.
  Add a null check for digitsHint.
  Don't commit fragment transactions if it's not safe.
  Add ListenableFuture based APIs for checkSpamStatus
  Pass activity between new call log's adapter/view holder.
  Replace assert checks with safety checks instead.
  Add SimpleSpamStatus and use it in FakeSpam and SpamStub
  Show calls to/from emergency numbers as "Emergency number" in call log & call details

1 files changed, 20 insertions, 9 deletions

diff --git a/java/com/android/dialer/spam/Spam.java b/java/com/android/dialer/spam/Spam.java
index 21d770ed3..181a55dea 100644
--- a/java/com/android/dialer/spam/Spam.java
+++ b/java/com/android/dialer/spam/Spam.java
@@ -24,6 +24,7 @@ import com.android.dialer.DialerPhoneNumber;
 import com.android.dialer.logging.ContactLookupResult;
 import com.android.dialer.logging.ContactSource;
 import com.android.dialer.logging.ReportingLocation;
+import com.android.dialer.spam.status.SpamStatus;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.util.concurrent.ListenableFuture;
@@ -41,6 +42,25 @@ public interface Spam {
       ImmutableSet<DialerPhoneNumber> dialerPhoneNumbers);
 
   /**
+   * Checks if the given number is suspected of being spam.
+   *
+   * @param dialerPhoneNumber the phone number.
+   * @return the {@link SpamStatus} for the given number.
+   */
+  ListenableFuture<SpamStatus> checkSpamStatus(DialerPhoneNumber dialerPhoneNumber);
+
+  /**
+   * Checks if the given number is suspected of being spam.
+   *
+   * <p>See {@link #checkSpamStatus(DialerPhoneNumber)}.
+   *
+   * @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> checkSpamStatus(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.
    *
@@ -55,15 +75,6 @@ public interface Spam {
   ListenableFuture<Void> updateSpamListDownload(boolean isEnabledByUser);
 
   /**
-   * Checks if the given number is suspected of being a spam.
-   *
-   * @param number The phone number of the call.
-   * @param countryIso The country ISO of the call.
-   * @param listener The callback to be invoked after {@code Info} is fetched.
-   */
-  void checkSpamStatus(String number, String countryIso, Listener listener);
-
-  /**
    * @param number The number to check if the number is in the user's white list (non spam list)
    * @param countryIso The country ISO of the call.
    * @param listener The callback to be invoked after {@code Info} is fetched.