Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "API for app to know what to set in Activity.setVolumeControlStream()"

Browse Source
This commit is contained in:
Jean-Michel Trivi
2017-02-06 18:54:32 +00:00
committed by Android (Google) Code Review
parent ad2409a26c a690473348
commit 49e57a2d9f
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -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

1
api/system-current.txt
View File

@@ -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

1
api/test-current.txt
View File

@@ -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

8
media/java/android/media/AudioAttributes.java
View File

@@ -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