commit 7f579fda4b3c83da6013a177e15c927360d37099
author Christoph Studer <chstuder@google.com> Fri Sep 05 14:11:51 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 05 14:11:52 2014 +0000
tree 8bcb54a91106952401130207dad18ffd2878b1b5
parent f2f0a071c26202a7a2dbfb4f6210adc1072e922e
parent 327bf78a7d1fd0ebf270af04005e9ff2405b59b7

Merge "NoMan: Fix speedbump for PRIORITY_MIN intrusives" into lmp-dev

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

diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java
index 0794edf..a66d34b 100644
--- a/services/core/java/com/android/server/notification/NotificationManagerService.java
+++ b/services/core/java/com/android/server/notification/NotificationManagerService.java
@@ -2636,7 +2636,10 @@
                 visibilityOverrides.putInt(record.sbn.getKey(),
                         record.getPackageVisibilityOverride());
             }
+            // Find first min-prio notification for speedbump placement.
             if (speedBumpIndex == -1 &&
+                    // Intrusiveness trumps priority, hence ignore intrusives.
+                    !record.isRecentlyIntrusive() &&
                     record.sbn.getNotification().priority == Notification.PRIORITY_MIN) {
                 speedBumpIndex = keys.size() - 1;
             }