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

am 57a03722: am aa99257d: Merge "Only play notification sounds for active user." into jb-mr1-dev

Browse Source 
* commit '57a0372221396279d4721a0ef33393d29e4de1cc':
  Only play notification sounds for active user.
This commit is contained in:
Jeff Sharkey
2012-10-05 15:40:09 -07:00
committed by Android Git Automerger
parent 055aa56ff3 57a0372221
commit 3034d3139e
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1033,7 +1033,8 @@ public class NotificationManagerService extends INotificationManager.Stub
if (((mDisabledNotifications & StatusBarManager.DISABLE_NOTIFICATION_ALERTS) == 0)
&& (!(old != null
&& (notification.flags & Notification.FLAG_ONLY_ALERT_ONCE) != 0 ))
&& (r.userId == UserHandle.USER_ALL || r.userId == userId)
&& (r.userId == UserHandle.USER_ALL ||
(r.userId == userId && r.userId == ActivityManager.getCurrentUser()))
&& mSystemReady) {
final AudioManager audioManager = (AudioManager) mContext