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

Merge "Prevent NotificationManagerService from using bad stream type" into lmp-dev

Browse Source
This commit is contained in:
Jean-Michel Trivi
2014-09-09 20:49:49 +00:00
committed by Android (Google) Code Review
parent 9ed0292a65 ceb79bc31a
commit 97dc52c857
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,6 +49,7 @@ import android.content.res.Resources;
import android.database.ContentObserver;
import android.media.AudioAttributes;
import android.media.AudioManager;
import android.media.AudioSystem;
import android.media.IRingtonePlayer;
import android.net.Uri;
import android.os.Binder;
@@ -1945,14 +1946,19 @@ public class NotificationManagerService extends SystemService {
}
private static AudioAttributes audioAttributesForNotification(Notification n) {
if (n.audioAttributes != null
&& !Notification.AUDIO_ATTRIBUTES_DEFAULT.equals(n.audioAttributes)) {
if (n.audioAttributes != null) {
return n.audioAttributes;
} else if (n.audioStreamType >= 0 && n.audioStreamType < AudioSystem.getNumStreamTypes()) {
// the stream type is valid, use it
return new AudioAttributes.Builder()
.setInternalLegacyStreamType(n.audioStreamType)
.build();
} else if (n.audioStreamType == AudioSystem.STREAM_DEFAULT) {
return Notification.AUDIO_ATTRIBUTES_DEFAULT;
} else {
Log.w(TAG, String.format("Invalid stream type: %d", n.audioStreamType));
return Notification.AUDIO_ATTRIBUTES_DEFAULT;
}
return new AudioAttributes.Builder()
.setLegacyStreamType(n.audioStreamType)
.setUsage(AudioAttributes.usageForLegacyStreamType(n.audioStreamType))
.build();
}
void showNextToastLocked() {