summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author RoboErik <epastern@google.com> 2014-05-21 19:04:08 -0700
committer RoboErik <epastern@google.com> 2014-05-21 19:04:08 -0700
commit02014c8faa43382fc1f7ce80a05991ff32ead89f (patch)
tree8111011333ec17eefb8bea52ca31b0155cb167b3
parent33983a901176adcc16c820444b667a37e6472243 (diff)
Switch to using int stream instead of AudioAttributes
This is an alternate to the submitted API which doesn't use the new AudioAttributes class and just takes the AudioManager.STREAM instead. Change-Id: I0365bc6fb9196fc33852ba6b202ca553efe0cc85
-rw-r--r--media/java/android/media/session/MediaSession.java15
1 files changed, 7 insertions, 8 deletions
diff --git a/media/java/android/media/session/MediaSession.java b/media/java/android/media/session/MediaSession.java
index 24bbc49e9852..539dc3cb7041 100644
--- a/media/java/android/media/session/MediaSession.java
+++ b/media/java/android/media/session/MediaSession.java
@@ -245,17 +245,16 @@ public final class MediaSession {
}
/**
- * Set the attributes for this session's local playback. This will affect
- * the system's default volume handling for this session. If
- * {@link #useRemotePlayback} was previously called it will stop receiving
- * volume commands and the system will begin handling volume changes.
+ * Set the stream this session is playing on. This will affect the system's
+ * volume handling for this session. If {@link #useRemotePlayback} was
+ * previously called it will stop receiving volume commands and the system
+ * will begin sending volume changes to the appropriate stream.
* <p>
- * By default sessions use {@link AudioAttributes#USAGE_MEDIA}.
+ * By default sessions are on {@link AudioManager#STREAM_MUSIC}.
*
- * @param attributes The {@link AudioAttributes} for this session's
- * playback.
+ * @param stream The {@link AudioManager} stream this session is playing on.
*/
- public void useLocalPlayback(AudioAttributes attributes) {
+ public void useLocalPlayback(int stream) {
// TODO
}