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

Merge "Use stream type if set by user" into lmp-mr1-dev

Browse Source
This commit is contained in:
Marco Nelissen
2014-11-18 22:20:03 +00:00
committed by Android (Google) Code Review
parent 25f20bdeab 1c066306c6
commit 6104fb2862
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) { if (hasValidSound) {
boolean looping = boolean looping =
(notification.flags & Notification.FLAG_INSISTENT) != 0; (notification.flags & Notification.FLAG_INSISTENT) != 0;
AudioAttributes audioAttributes; AudioAttributes audioAttributes = audioAttributesForNotification(notification);
if (notification.audioAttributes != null) {
audioAttributes = notification.audioAttributes;
} else {
audioAttributes = Notification.AUDIO_ATTRIBUTES_DEFAULT;
}
mSoundNotification = record; mSoundNotification = record;
// do not play notifications if stream volume is 0 (typically because // 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 // 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) { 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; return n.audioAttributes;
} else if (n.audioStreamType >= 0 && n.audioStreamType < AudioSystem.getNumStreamTypes()) { } else if (n.audioStreamType >= 0 && n.audioStreamType < AudioSystem.getNumStreamTypes()) {
// the stream type is valid, use it // the stream type is valid, use it