Merge "PlayerBase: hide deprecateStreamTypeForPlayback" (a59197e3) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −3

media/java/android/media/PlayerBase.java

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -571,13 +571,12 @@ public abstract class PlayerBase {
	// Utilities		// Utilities

	/**		/**
			* @hide
	* Use to generate warning or exception in legacy code paths that allowed passing stream types		* Use to generate warning or exception in legacy code paths that allowed passing stream types
	* to qualify audio playback.		* to qualify audio playback.
	* @param streamType the stream type to check		* @param streamType the stream type to check
	* @throws IllegalArgumentException		* @throws IllegalArgumentException
	* @deprecated This method is not intended to be used by applications.
	*/		*/
	@java.lang.Deprecated
	public static void deprecateStreamTypeForPlayback(int streamType, @NonNull String className,		public static void deprecateStreamTypeForPlayback(int streamType, @NonNull String className,
	@NonNull String opName) throws IllegalArgumentException {		@NonNull String opName) throws IllegalArgumentException {
	// STREAM_ACCESSIBILITY was introduced at the same time the use of stream types		// STREAM_ACCESSIBILITY was introduced at the same time the use of stream types

Original line number	Original line	Diff line number	Diff line
	@@ -23571,7 +23571,6 @@ package android.media {
	method @Deprecated public void addOnRoutingChangedListener(android.media.AudioTrack.OnRoutingChangedListener, android.os.Handler);		method @Deprecated public void addOnRoutingChangedListener(android.media.AudioTrack.OnRoutingChangedListener, android.os.Handler);
	method public int attachAuxEffect(int);		method public int attachAuxEffect(int);
	method @NonNull public android.media.VolumeShaper createVolumeShaper(@NonNull android.media.VolumeShaper.Configuration);		method @NonNull public android.media.VolumeShaper createVolumeShaper(@NonNull android.media.VolumeShaper.Configuration);
	method @Deprecated public static void deprecateStreamTypeForPlayback(int, @NonNull String, @NonNull String) throws java.lang.IllegalArgumentException;
	method protected void finalize();		method protected void finalize();
	method public void flush();		method public void flush();
	method @NonNull public android.media.AudioAttributes getAudioAttributes();		method @NonNull public android.media.AudioAttributes getAudioAttributes();
	@@ -25328,7 +25327,6 @@ package android.media {
	method public static android.media.MediaPlayer create(android.content.Context, int);		method public static android.media.MediaPlayer create(android.content.Context, int);
	method public static android.media.MediaPlayer create(android.content.Context, int, android.media.AudioAttributes, int);		method public static android.media.MediaPlayer create(android.content.Context, int, android.media.AudioAttributes, int);
	method @NonNull public android.media.VolumeShaper createVolumeShaper(@NonNull android.media.VolumeShaper.Configuration);		method @NonNull public android.media.VolumeShaper createVolumeShaper(@NonNull android.media.VolumeShaper.Configuration);
	method @Deprecated public static void deprecateStreamTypeForPlayback(int, @NonNull String, @NonNull String) throws java.lang.IllegalArgumentException;
	method public void deselectTrack(int) throws java.lang.IllegalStateException;		method public void deselectTrack(int) throws java.lang.IllegalStateException;
	method protected void finalize();		method protected void finalize();
	method public int getAudioSessionId();		method public int getAudioSessionId();
	@@ -26423,7 +26421,6 @@ package android.media {
	ctor @Deprecated public SoundPool(int, int, int);		ctor @Deprecated public SoundPool(int, int, int);
	method public final void autoPause();		method public final void autoPause();
	method public final void autoResume();		method public final void autoResume();
	method @Deprecated public static void deprecateStreamTypeForPlayback(int, @NonNull String, @NonNull String) throws java.lang.IllegalArgumentException;
	method protected void finalize();		method protected void finalize();
	method public int load(String, int);		method public int load(String, int);
	method public int load(android.content.Context, int, int);		method public int load(android.content.Context, int, int);