Properly support USER_ALL in notification listener API.
Listeners should be notified for any notification if they
register for USER_ALL, or for any notification posted to
USER_ALL.
Bug: 8328357
Change-Id: Ib5024d41287090d1a390539a015d8cb4dfa854a7
diff --git a/services/java/com/android/server/NotificationManagerService.java b/services/java/com/android/server/NotificationManagerService.java
index 9f2685b..1e394d6 100644
--- a/services/java/com/android/server/NotificationManagerService.java
+++ b/services/java/com/android/server/NotificationManagerService.java
@@ -186,8 +186,14 @@
this.userid = userid;
}
+ boolean userMatches(StatusBarNotification sbn) {
+ if (this.userid == UserHandle.USER_ALL) return true;
+ int nid = sbn.getUserId();
+ return (nid == UserHandle.USER_ALL || nid == this.userid);
+ }
+
public void notifyPostedIfUserMatch(StatusBarNotification sbn) {
- if (this.userid != sbn.getUserId()) return;
+ if (!userMatches(sbn)) return;
try {
listener.onNotificationPosted(sbn);
} catch (RemoteException ex) {
@@ -196,7 +202,7 @@
}
public void notifyRemovedIfUserMatch(StatusBarNotification sbn) {
- if (this.userid != sbn.getUserId()) return;
+ if (!userMatches(sbn)) return;
try {
listener.onNotificationRemoved(sbn);
} catch (RemoteException ex) {