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

am 0acbed25: am 6104fb28: Merge "Use stream type if set by user" into lmp-mr1-dev

Browse Source 
* commit '0acbed256eaadd3e704942405d130729d3366534':
  Use stream type if set by user
This commit is contained in:
Marco Nelissen
2014-11-18 22:30:03 +00:00
committed by Android Git Automerger
parent 86b7699875 0acbed256e
commit 7f8040a804
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/notification/NotificationManagerService.java
View File

@@ -1931,12 +1931,7 @@ public class NotificationManagerService extends SystemService {
if (hasValidSound) {
boolean looping =
(notification.flags & Notification.FLAG_INSISTENT) != 0;
AudioAttributes audioAttributes;
if (notification.audioAttributes != null) {
audioAttributes = notification.audioAttributes;
} else {
audioAttributes = Notification.AUDIO_ATTRIBUTES_DEFAULT;
}
AudioAttributes audioAttributes = audioAttributesForNotification(notification);
mSoundNotification = record;
// do not play notifications if stream volume is 0 (typically because
// ringer mode is silent) or if there is a user of exclusive audio focus
@@ -2030,7 +2025,9 @@ public class NotificationManagerService extends SystemService {
}
private static AudioAttributes audioAttributesForNotification(Notification n) {
if (n.audioAttributes != null) {
if (n.audioAttributes != null
&& !Notification.AUDIO_ATTRIBUTES_DEFAULT.equals(n.audioAttributes)) {
// the audio attributes are set and different from the default, use them
return n.audioAttributes;
} else if (n.audioStreamType >= 0 && n.audioStreamType < AudioSystem.getNumStreamTypes()) {
// the stream type is valid, use it