Merge "Reintroduce priority to notification sorting order." into nyc-dev (ba5c35b7) · Commits · e / os / android_frameworks_base

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

+9 −1

Original line number	Diff line number	Diff line
		@@ -28,10 +28,11 @@ public class NotificationComparator
		final int leftImportance = left.getImportance();
		final int rightImportance = right.getImportance();
		if (leftImportance != rightImportance) {
		// by priority, high to low
		// by importance, high to low
		return -1 * Integer.compare(leftImportance, rightImportance);
		}

		// Whether or not the notification can bypass DND.
		final int leftPackagePriority = left.getPackagePriority();
		final int rightPackagePriority = right.getPackagePriority();
		if (leftPackagePriority != rightPackagePriority) {
		@@ -39,6 +40,13 @@ public class NotificationComparator
		return -1 * Integer.compare(leftPackagePriority, rightPackagePriority);
		}

		final int leftPriority = left.sbn.getNotification().priority;
		final int rightPriority = right.sbn.getNotification().priority;
		if (leftPriority != rightPriority) {
		// by priority, high to low
		return -1 * Integer.compare(leftPriority, rightPriority);
		}

		final float leftPeople = left.getContactAffinity();
		final float rightPeople = right.getContactAffinity();
		if (leftPeople != rightPeople) {