commit fc95e673d30046f15cf1c5dc6069791500036e9c
author Jean-Michel Trivi <jmtrivi@google.com> Wed Feb 13 11:41:12 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Feb 13 11:41:12 2013 -0800
tree f7c1f53abfb8a4170ce5cfd42160b8cbc3e4dd94
parent c29aff2581795fe7a147a8b5cf418254ecbd4fe8
parent 23bbe02b363bb96bd56d4008141e8cf800bb46b7

am 23bbe02b: Merge "No AudioFocus for notifications when media played remotely"

# Via Android (Google) Code Review (1) and Jean-Michel Trivi (1)
* commit '23bbe02b363bb96bd56d4008141e8cf800bb46b7':
  No AudioFocus for notifications when media played remotely

packages/SystemUI/src/com/android/systemui/media/NotificationPlayer.java

diff --git a/packages/SystemUI/src/com/android/systemui/media/NotificationPlayer.java b/packages/SystemUI/src/com/android/systemui/media/NotificationPlayer.java
index 6a12eb1..ba2fbe3 100644
--- a/packages/SystemUI/src/com/android/systemui/media/NotificationPlayer.java
+++ b/packages/SystemUI/src/com/android/systemui/media/NotificationPlayer.java
@@ -90,12 +90,14 @@
                     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);