From e1541e7ec9c40a81a99ceafe1fba4e594ac53c6c Mon Sep 17 00:00:00 2001
From: Beverly <beverlyt@google.com>
Date: Mon, 16 Dec 2019 13:29:08 -0500
Subject: [PATCH] Update Ranking's equal method

Include check for whether mVisuallyInterruptive has changed

Test: atest BubbleDataTest
Change-Id: I5c4706667e6ca4cde44ef3671daa24afaf2b14f3
---
 .../service/notification/NotificationListenerService.java      | 3 ++-
 .../src/com/android/systemui/statusbar/RankingBuilder.java     | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/java/android/service/notification/NotificationListenerService.java b/core/java/android/service/notification/NotificationListenerService.java
index 85f13d552fcfe..c04ac5929e1fa 100644
--- a/core/java/android/service/notification/NotificationListenerService.java
+++ b/core/java/android/service/notification/NotificationListenerService.java
@@ -1895,7 +1895,8 @@ public abstract class NotificationListenerService extends Service {
                     && ((mSmartActions == null ? 0 : mSmartActions.size())
                         == (other.mSmartActions == null ? 0 : other.mSmartActions.size()))
                     && Objects.equals(mSmartReplies, other.mSmartReplies)
-                    && Objects.equals(mCanBubble, other.mCanBubble);
+                    && Objects.equals(mCanBubble, other.mCanBubble)
+                    && Objects.equals(mVisuallyInterruptive, other.mVisuallyInterruptive);
         }
     }
 
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/RankingBuilder.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/RankingBuilder.java
index d003b994f6dd4..5310dd8a61f92 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/RankingBuilder.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/RankingBuilder.java
@@ -76,6 +76,7 @@ public class RankingBuilder {
         mSmartActions = copyList(ranking.getSmartActions());
         mSmartReplies = copyList(ranking.getSmartReplies());
         mCanBubble = ranking.canBubble();
+        mIsVisuallyInterruptive = ranking.visuallyInterruptive();
     }
 
     public Ranking build() {