Merge "No AudioFocus for notifications when media played remotely"

This commit is contained in:
Jean-Michel Trivi
2013-02-13 19:37:44 +00:00
committed by Android (Google) Code Review

View File

@@ -90,12 +90,14 @@ public class NotificationPlayer implements OnCompletionListener {
player.prepare();
if ((mCmd.uri != null) && (mCmd.uri.getEncodedPath() != null)
&& (mCmd.uri.getEncodedPath().length() > 0)) {
if (mCmd.looping) {
audioManager.requestAudioFocus(null, mCmd.stream,
AudioManager.AUDIOFOCUS_GAIN);
} else {
audioManager.requestAudioFocus(null, mCmd.stream,
AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK);
if (!audioManager.isMusicActiveRemotely()) {
if (mCmd.looping) {
audioManager.requestAudioFocus(null, mCmd.stream,
AudioManager.AUDIOFOCUS_GAIN);
} else {
audioManager.requestAudioFocus(null, mCmd.stream,
AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK);
}
}
}
player.setOnCompletionListener(NotificationPlayer.this);