commit 8a3d68f1f0989655eb5ed6b09c91394a4ce186da
author Chris Wren <cwren@android.com> Wed Jun 15 15:57:16 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jun 15 15:57:16 2016 +0000
tree 28afb333f6cc66f7eb650ac1cf3ba1dae638c89d
parent ea3f5c27fcc12b1cfb1148ac2c51aa161cbbcb2d
parent b6a19b1ce16372ff0ef43f3da7219b458790c416

Merge \\"Revert \\"boost starred people to at least high importance\\"\\" into nyc-dev am: f156ab3f3a
am: b6a19b1ce1

Change-Id: I1a74db56ffae32e80a723584e15b42eb30114fce

services/core/java/com/android/server/notification/NotificationRecord.java

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());
         }
     }