Merge \\"Revert \\"boost starred people to at least high importance\\"\\" into nyc-dev am: f156ab3f3a
am: b6a19b1ce1
Change-Id: I1a74db56ffae32e80a723584e15b42eb30114fce
diff --git a/services/core/java/com/android/server/notification/NotificationRecord.java b/services/core/java/com/android/server/notification/NotificationRecord.java
index 367f8cb..7c89e9f 100644
--- a/services/core/java/com/android/server/notification/NotificationRecord.java
+++ b/services/core/java/com/android/server/notification/NotificationRecord.java
@@ -318,12 +318,8 @@
public void setContactAffinity(float contactAffinity) {
mContactAffinity = contactAffinity;
- if (mImportance < IMPORTANCE_HIGH &&
- mContactAffinity >= ValidateNotificationPeople.STARRED_CONTACT) {
- setImportance(IMPORTANCE_HIGH, getPeopleExplanation());
- }
if (mImportance < IMPORTANCE_DEFAULT &&
- mContactAffinity >= ValidateNotificationPeople.VALID_CONTACT) {
+ mContactAffinity > ValidateNotificationPeople.VALID_CONTACT) {
setImportance(IMPORTANCE_DEFAULT, getPeopleExplanation());
}
}