diff options
| -rw-r--r-- | media/java/android/media/session/MediaController.java | 5 | ||||
| -rw-r--r-- | services/core/java/com/android/server/media/MediaSessionRecord.java | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/media/java/android/media/session/MediaController.java b/media/java/android/media/session/MediaController.java index 9641f83c8a33..12ee59e1f62a 100644 --- a/media/java/android/media/session/MediaController.java +++ b/media/java/android/media/session/MediaController.java @@ -47,8 +47,9 @@ import java.util.List; * receive updates from the session, such as metadata and play state changes. * <p> * A MediaController can be created through {@link MediaSessionManager} if you - * hold the "android.permission.MEDIA_CONTENT_CONTROL" permission or directly if - * you have a {@link MediaSession.Token} from the session owner. + * hold the "android.permission.MEDIA_CONTENT_CONTROL" permission or are an + * enabled notification listener or by getting a {@link MediaSession.Token} + * directly from the session owner. * <p> * MediaController objects are thread-safe. */ diff --git a/services/core/java/com/android/server/media/MediaSessionRecord.java b/services/core/java/com/android/server/media/MediaSessionRecord.java index 0da2cfa8e19f..b936130dbc15 100644 --- a/services/core/java/com/android/server/media/MediaSessionRecord.java +++ b/services/core/java/com/android/server/media/MediaSessionRecord.java @@ -231,7 +231,7 @@ public class MediaSessionRecord implements IBinder.DeathRecipient { * @param direction The direction to adjust volume in. */ public void adjustVolume(int direction, int flags, String packageName, int uid) { - if (isPlaybackActive(false)) { + if (isPlaybackActive(false) || hasFlag(MediaSession.FLAG_EXCLUSIVE_GLOBAL_PRIORITY)) { flags &= ~AudioManager.FLAG_PLAY_SOUND; } if (direction > 1) { |