drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 3cf1faf2: am 9f3443c5: Merge "Properly support USER_ALL in notification listener API." into jb-mr2-dev

Browse Source 
* commit '3cf1faf296aebc6ea024a363fc7899f4ba5dbac3':
  Properly support USER_ALL in notification listener API.
This commit is contained in:
Daniel Sandler
2013-03-07 20:53:38 +00:00
committed by Android Git Automerger
parent 577cee774e 3cf1faf296
commit 603603d22f
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -186,8 +186,14 @@ public class NotificationManagerService extends INotificationManager.Stub
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 class NotificationManagerService extends INotificationManager.Stub
}
public void notifyRemovedIfUserMatch(StatusBarNotification sbn) {
if (this.userid != sbn.getUserId()) return;
if (!userMatches(sbn)) return;
try {
listener.onNotificationRemoved(sbn);
} catch (RemoteException ex) {