diff options
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | api/test-current.txt | 1 | ||||
| -rw-r--r-- | media/java/android/media/AudioAttributes.java | 23 |
4 files changed, 0 insertions, 26 deletions
diff --git a/api/current.txt b/api/current.txt index 5926e9876364..4afe5889f3ed 100644 --- a/api/current.txt +++ b/api/current.txt @@ -20899,7 +20899,6 @@ package android.media { method public int getContentType(); method public int getFlags(); method public int getUsage(); - method public static deprecated int getVolumeControlStream(android.media.AudioAttributes); method public int getVolumeControlStream(); method public void writeToParcel(android.os.Parcel, int); field public static final int CONTENT_TYPE_MOVIE = 3; // 0x3 diff --git a/api/system-current.txt b/api/system-current.txt index a5f10cd42c72..e680679dce19 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -22639,7 +22639,6 @@ package android.media { method public int getContentType(); method public int getFlags(); method public int getUsage(); - method public static deprecated int getVolumeControlStream(android.media.AudioAttributes); method public int getVolumeControlStream(); method public void writeToParcel(android.os.Parcel, int); field public static final int CONTENT_TYPE_MOVIE = 3; // 0x3 diff --git a/api/test-current.txt b/api/test-current.txt index 1b5eeedfdf12..a8eb189b372e 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -21012,7 +21012,6 @@ package android.media { method public int getContentType(); method public int getFlags(); method public int getUsage(); - method public static deprecated int getVolumeControlStream(android.media.AudioAttributes); method public int getVolumeControlStream(); method public void writeToParcel(android.os.Parcel, int); field public static final int CONTENT_TYPE_MOVIE = 3; // 0x3 diff --git a/media/java/android/media/AudioAttributes.java b/media/java/android/media/AudioAttributes.java index 77a82ec8cacd..e36ceb8a3e13 100644 --- a/media/java/android/media/AudioAttributes.java +++ b/media/java/android/media/AudioAttributes.java @@ -913,29 +913,6 @@ public final class AudioAttributes implements Parcelable { } } - // TODO remove, replaced by non-static API getVolumeControlStream() - /** - * Returns the stream type matching the given attributes for volume control. - * Use this method to derive the stream type needed to configure the volume - * control slider in an {@link android.app.Activity} with - * {@link android.app.Activity#setVolumeControlStream(int)}. - * <BR>Do not use this method to set the stream type on an audio player object - * (e.g. {@link AudioTrack}, {@link MediaPlayer}) as this is deprecated, - * use <code>AudioAttributes</code> instead. - * @param aa non-null AudioAttributes. - * @return a valid stream type for <code>Activity</code> or stream volume control that matches - * the attributes, or {@link AudioManager#USE_DEFAULT_STREAM_TYPE} if there isn't a direct - * match. Note that <code>USE_DEFAULT_STREAM_TYPE</code> is not a valid value - * for {@link AudioManager#setStreamVolume(int, int, int)}. - * @deprecated use {@link #getVolumeControlStream()} - */ - public static int getVolumeControlStream(@NonNull AudioAttributes aa) { - if (aa == null) { - throw new IllegalArgumentException("Invalid null audio attributes"); - } - return toVolumeStreamType(true /*fromGetVolumeControlStream*/, aa); - } - /** * Returns the stream type matching this {@code AudioAttributes} instance for volume control. * Use this method to derive the stream type needed to configure the volume |