1 files changed, 9 insertions, 5 deletions
diff --git a/java/com/android/incallui/answer/impl/AnswerFragment.java b/java/com/android/incallui/answer/impl/AnswerFragment.java
index 7fa559d6e..1f0541c4b 100644
--- a/java/com/android/incallui/answer/impl/AnswerFragment.java
+++ b/java/com/android/incallui/answer/impl/AnswerFragment.java
@@ -543,7 +543,10 @@ public class AnswerFragment extends Fragment
         // Needs replacement
         newFragment =
             MultimediaFragment.newInstance(
-                multimediaData, false /* isInteractive */, true /* showAvatar */);
+                multimediaData,
+                false /* isInteractive */,
+                !primaryInfo.isSpam /* showAvatar */,
+                primaryInfo.isSpam);
       }
     } else if (shouldShowAvatar()) {
       // Needs Avatar
@@ -658,9 +661,6 @@ public class AnswerFragment extends Fragment
     affordanceHolderLayout.setAffordanceCallback(affordanceCallback);
 
     importanceBadge = view.findViewById(R.id.incall_important_call_badge);
-    PillDrawable importanceBackground = new PillDrawable();
-    importanceBackground.setColor(getContext().getColor(android.R.color.white));
-    importanceBadge.setBackground(importanceBackground);
     importanceBadge
         .getViewTreeObserver()
         .addOnGlobalLayoutListener(
@@ -771,6 +771,7 @@ public class AnswerFragment extends Fragment
   public void onPause() {
     super.onPause();
     LogUtil.i("AnswerFragment.onPause", null);
+    inCallScreenDelegate.onInCallScreenPaused();
   }
 
   @Override
@@ -941,6 +942,9 @@ public class AnswerFragment extends Fragment
 
   private void showMessageMenu() {
     LogUtil.i("AnswerFragment.showMessageMenu", "Show sms menu.");
+    if (getChildFragmentManager().isDestroyed()) {
+      return;
+    }
 
     textResponsesFragment = SmsBottomSheetFragment.newInstance(textResponses);
     textResponsesFragment.show(getChildFragmentManager(), null);
@@ -1019,7 +1023,7 @@ public class AnswerFragment extends Fragment
       return;
     }
 
-    if (!getResources().getBoolean(R.bool.answer_important_call_allowed)) {
+    if (!getResources().getBoolean(R.bool.answer_important_call_allowed) || primaryInfo.isSpam) {
       importanceBadge.setVisibility(View.GONE);
       return;
     }