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

Author: jsharkey

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

@@ -1033,7 +1033,8 @@ public void enqueueNotificationInternal(String pkg, int callingUid, int callingP
             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