Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d29d66c7 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by Android (Google) Code Review
Browse files

Merge "Stream types are for volume control"

parents 54365465 2f7511fd

api/current.txt

+3 −3
Original line number Diff line number Diff line
@@ -20199,8 +20199,8 @@ package android.media { 
  }















  public class AudioTrack implements android.media.AudioRouting {













    ctor public AudioTrack(int, int, int, int, int, int) throws java.lang.IllegalArgumentException;













    ctor public AudioTrack(int, int, int, int, int, int, int) throws java.lang.IllegalArgumentException;













    ctor public deprecated AudioTrack(int, int, int, int, int, int) throws java.lang.IllegalArgumentException;













    ctor public deprecated AudioTrack(int, int, int, int, int, int, int) throws java.lang.IllegalArgumentException;















    ctor public AudioTrack(android.media.AudioAttributes, android.media.AudioFormat, int, int, int) throws java.lang.IllegalArgumentException;















    method public void addOnRoutingChangedListener(android.media.AudioRouting.OnRoutingChangedListener, android.os.Handler);















    method public deprecated void addOnRoutingChangedListener(android.media.AudioTrack.OnRoutingChangedListener, android.os.Handler);










@@ -21489,7 +21489,7 @@ package android.media {













    method public void selectTrack(int) throws java.lang.IllegalStateException;















    method public void setAudioAttributes(android.media.AudioAttributes) throws java.lang.IllegalArgumentException;















    method public void setAudioSessionId(int) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException;













    method public void setAudioStreamType(int);













    method public deprecated void setAudioStreamType(int);















    method public void setAuxEffectSendLevel(float);















    method public void setDataSource(android.content.Context, android.net.Uri) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.SecurityException;















    method public void setDataSource(android.content.Context, android.net.Uri, java.util.Map<java.lang.String, java.lang.String>) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.SecurityException;

























api/system-current.txt



+3
−3




























Original line number
Diff line number
Diff line








@@ -21766,8 +21766,8 @@ package android.media {













  }





























  public class AudioTrack implements android.media.AudioRouting {













    ctor public AudioTrack(int, int, int, int, int, int) throws java.lang.IllegalArgumentException;













    ctor public AudioTrack(int, int, int, int, int, int, int) throws java.lang.IllegalArgumentException;













    ctor public deprecated AudioTrack(int, int, int, int, int, int) throws java.lang.IllegalArgumentException;













    ctor public deprecated AudioTrack(int, int, int, int, int, int, int) throws java.lang.IllegalArgumentException;















    ctor public AudioTrack(android.media.AudioAttributes, android.media.AudioFormat, int, int, int) throws java.lang.IllegalArgumentException;















    method public void addOnRoutingChangedListener(android.media.AudioRouting.OnRoutingChangedListener, android.os.Handler);















    method public deprecated void addOnRoutingChangedListener(android.media.AudioTrack.OnRoutingChangedListener, android.os.Handler);










@@ -23056,7 +23056,7 @@ package android.media {













    method public void selectTrack(int) throws java.lang.IllegalStateException;















    method public void setAudioAttributes(android.media.AudioAttributes) throws java.lang.IllegalArgumentException;















    method public void setAudioSessionId(int) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException;













    method public void setAudioStreamType(int);













    method public deprecated void setAudioStreamType(int);















    method public void setAuxEffectSendLevel(float);















    method public void setDataSource(android.content.Context, android.net.Uri) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.SecurityException;















    method public void setDataSource(android.content.Context, android.net.Uri, java.util.Map<java.lang.String, java.lang.String>) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.SecurityException;

























api/test-current.txt



+3
−3




























Original line number
Diff line number
Diff line








@@ -20286,8 +20286,8 @@ package android.media {













  }





























  public class AudioTrack implements android.media.AudioRouting {













    ctor public AudioTrack(int, int, int, int, int, int) throws java.lang.IllegalArgumentException;













    ctor public AudioTrack(int, int, int, int, int, int, int) throws java.lang.IllegalArgumentException;













    ctor public deprecated AudioTrack(int, int, int, int, int, int) throws java.lang.IllegalArgumentException;













    ctor public deprecated AudioTrack(int, int, int, int, int, int, int) throws java.lang.IllegalArgumentException;















    ctor public AudioTrack(android.media.AudioAttributes, android.media.AudioFormat, int, int, int) throws java.lang.IllegalArgumentException;















    method public void addOnRoutingChangedListener(android.media.AudioRouting.OnRoutingChangedListener, android.os.Handler);















    method public deprecated void addOnRoutingChangedListener(android.media.AudioTrack.OnRoutingChangedListener, android.os.Handler);










@@ -21576,7 +21576,7 @@ package android.media {













    method public void selectTrack(int) throws java.lang.IllegalStateException;















    method public void setAudioAttributes(android.media.AudioAttributes) throws java.lang.IllegalArgumentException;















    method public void setAudioSessionId(int) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException;













    method public void setAudioStreamType(int);













    method public deprecated void setAudioStreamType(int);















    method public void setAuxEffectSendLevel(float);















    method public void setDataSource(android.content.Context, android.net.Uri) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.SecurityException;















    method public void setDataSource(android.content.Context, android.net.Uri, java.util.Map<java.lang.String, java.lang.String>) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.SecurityException;

























core/java/android/app/Notification.java



+2
−0




























Original line number
Diff line number
Diff line








@@ -37,6 +37,7 @@ import android.graphics.drawable.Drawable;













import android.graphics.drawable.Icon;















import android.media.AudioAttributes;















import android.media.AudioManager;













import android.media.PlayerBase;















import android.media.session.MediaSession;















import android.net.Uri;















import android.os.BadParcelableException;










@@ -2821,6 +2822,7 @@ public class Notification implements Parcelable













         */















        @Deprecated















        public Builder setSound(Uri sound, int streamType) {













            PlayerBase.deprecateStreamTypeForPlayback(streamType, "Notification", "setSound()");















            mN.sound = sound;















            mN.audioStreamType = streamType;















            return this;

































media/java/android/media/AsyncPlayer.java



+2
−0




























Original line number
Diff line number
Diff line








@@ -18,6 +18,7 @@ package android.media;





























import android.annotation.NonNull;















import android.content.Context;













import android.media.PlayerBase;















import android.net.Uri;















import android.os.PowerManager;















import android.os.SystemClock;










@@ -163,6 +164,7 @@ public class AsyncPlayer {













     * @deprecated use {@link #play(Context, Uri, boolean, AudioAttributes)} instead















     */















    public void play(Context context, Uri uri, boolean looping, int stream) {













        PlayerBase.deprecateStreamTypeForPlayback(stream, "AsyncPlayer", "play()");















        if (context == null || uri == null) {















            return;















        }