Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 081c36de: am bfb8a7b1: am 3fe2cb4d: Merge "Don\'t cancel any notifications that are meant for all users, if no package is specified." into jb-mr1-dev

Browse Source 
* commit '081c36ded6a562ae2bde4238592a1e7bc13ba151':
  Don't cancel any notifications that are meant for all users, if no package is specified.
This commit is contained in:
Amith Yamasani
2012-11-08 15:44:40 -08:00
committed by Android Git Automerger
parent ae41ba1563 081c36ded6
commit 807dc6f038
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/java/com/android/server/NotificationManagerService.java
View File

@@ -1261,6 +1261,10 @@ public class NotificationManagerService extends INotificationManager.Stub
if (!notificationMatchesUserId(r, userId)) { if (!notificationMatchesUserId(r, userId)) {
continue; continue;
} }
// Don't remove notifications to all, if there's no package name specified
if (r.userId == UserHandle.USER_ALL && pkg == null) {
continue;
}
if ((r.notification.flags & mustHaveFlags) != mustHaveFlags) { if ((r.notification.flags & mustHaveFlags) != mustHaveFlags) {
continue; continue;
} }