summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorBeverly <beverlyt@google.com>2019-10-24 13:35:03 -0400
committerBeverly Tai <beverlyt@google.com>2019-10-24 21:35:00 +0000
commit4f8b0224e12037f5c41200722d689e1c8e0d8e1e (patch)
tree42c4e9c2349482cad406c685e02468bc692c0765 /core/java/android
parentcabc32d247ab53966c6f0a516142a7d011e1248f (diff)
Update equals and hashCode methods of NoMan.Policy
Test: atest AudioManagerTest#testPriorityOnlyChannelsCanBypassDnd Bug: 142395610 Bug: 142643922 Change-Id: I15835f784ba73b40eccf92a0a430905d28647669
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/app/NotificationManager.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/app/NotificationManager.java b/core/java/android/app/NotificationManager.java
index 6dca5d921210..03ee1e93ba7e 100644
--- a/core/java/android/app/NotificationManager.java
+++ b/core/java/android/app/NotificationManager.java
@@ -1772,7 +1772,7 @@ public class NotificationManager {
@Override
public int hashCode() {
return Objects.hash(priorityCategories, priorityCallSenders, priorityMessageSenders,
- suppressedVisualEffects);
+ suppressedVisualEffects, state);
}
@Override
@@ -1784,10 +1784,10 @@ public class NotificationManager {
&& other.priorityCallSenders == priorityCallSenders
&& other.priorityMessageSenders == priorityMessageSenders
&& suppressedVisualEffectsEqual(suppressedVisualEffects,
- other.suppressedVisualEffects);
+ other.suppressedVisualEffects)
+ && other.state == this.state;
}
-
private boolean suppressedVisualEffectsEqual(int suppressedEffects,
int otherSuppressedVisualEffects) {
if (suppressedEffects == otherSuppressedVisualEffects) {