Merge changes If1ae5505,I65e9c6ac,I1a72ca86,I417b46ed,I60f97924

* changes:
  Better support for multi call.
  Migrate RTT chat history to use proto buffer.
  Disable RTT request button when the call is not active yet.
  Use the default phone account for a voice call when the call log item is for Duo.
  Explicitly hide the badge in ContactPhotoView when it shouldn't be shown.

1 files changed, 3 insertions, 0 deletions

diff --git a/java/com/android/dialer/widget/ContactPhotoView.java b/java/com/android/dialer/widget/ContactPhotoView.java
index 6fcc89ab0..5020875dc 100644
--- a/java/com/android/dialer/widget/ContactPhotoView.java
+++ b/java/com/android/dialer/widget/ContactPhotoView.java
@@ -86,12 +86,15 @@ public final class ContactPhotoView extends FrameLayout {
   private void setBadge(PhotoInfo photoInfo) {
     // No badge for spam numbers.
     if (photoInfo.getIsSpam()) {
+      hideBadge();
       return;
     }
 
     if (photoInfo.getIsVideo()) {
       contactBadgeContainer.setVisibility(View.VISIBLE);
       videoCallBadge.setVisibility(View.VISIBLE);
+    } else {
+      hideBadge();
     }
   }
 }