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 | 8 |
4 files changed, 7 insertions, 4 deletions
diff --git a/api/current.txt b/api/current.txt index 9dff8cb4de32..e315958badeb 100644 --- a/api/current.txt +++ b/api/current.txt @@ -20455,6 +20455,7 @@ package android.media { method public int getContentType(); method public int getFlags(); method public int getUsage(); + method public static int getVolumeControlStream(android.media.AudioAttributes); method public void writeToParcel(android.os.Parcel, int); field public static final int CONTENT_TYPE_MOVIE = 3; // 0x3 field public static final int CONTENT_TYPE_MUSIC = 2; // 0x2 diff --git a/api/system-current.txt b/api/system-current.txt index bbfe5b36f2b3..ae145dc9b037 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -22016,6 +22016,7 @@ package android.media { method public int getContentType(); method public int getFlags(); method public int getUsage(); + method public static int getVolumeControlStream(android.media.AudioAttributes); method public void writeToParcel(android.os.Parcel, int); field public static final int CONTENT_TYPE_MOVIE = 3; // 0x3 field public static final int CONTENT_TYPE_MUSIC = 2; // 0x2 diff --git a/api/test-current.txt b/api/test-current.txt index d547532fcd11..1e3b6db92185 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -20547,6 +20547,7 @@ package android.media { method public int getContentType(); method public int getFlags(); method public int getUsage(); + method public static int getVolumeControlStream(android.media.AudioAttributes); method public void writeToParcel(android.os.Parcel, int); field public static final int CONTENT_TYPE_MOVIE = 3; // 0x3 field public static final int CONTENT_TYPE_MUSIC = 2; // 0x2 diff --git a/media/java/android/media/AudioAttributes.java b/media/java/android/media/AudioAttributes.java index 391a905d0419..ce58a9c4b91e 100644 --- a/media/java/android/media/AudioAttributes.java +++ b/media/java/android/media/AudioAttributes.java @@ -913,13 +913,13 @@ public final class AudioAttributes implements Parcelable { } } /** - * @hide - * CANDIDATE FOR PUBLIC (or at least SYSTEM) API * 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 Activity} with {@link Activity#setVolumeControlStream(int)}. + * 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}), use <code>AudioAttributes</code> instead. + * (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 |