Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57a03722 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android Git Automerger
Browse files

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

* commit 'aa99257d':
  Only play notification sounds for active user.
parents 0c177a8f aa99257d

services/java/com/android/server/NotificationManagerService.java

+2 −1
Original line number Diff line number Diff line
@@ -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