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

* commit 'aa99257dec300c1db99ee0f0d1193e0b301dde39':
  Only play notification sounds for active user.
This commit is contained in:
Jeff Sharkey
2012-10-05 15:38:20 -07:00
committed by Android Git Automerger

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