drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "AudioAttributes: make getVolumeControlStream() non static" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-03-29 17:39:57 +00:00
committed by Android (Google) Code Review
parent ddb280b1ac e67bc4d484
commit bf6b4efa6d
4 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api/current.txt
View File

@ -20891,7 +20891,8 @@ package android.media {
method public int getContentType(); method public int getContentType();
method public int getFlags(); method public int getFlags();
method public int getUsage(); method public int getUsage();
method public static int getVolumeControlStream(android.media.AudioAttributes); method public static deprecated int getVolumeControlStream(android.media.AudioAttributes);
method public int getVolumeControlStream();
method public void writeToParcel(android.os.Parcel, int); 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_MOVIE = 3; // 0x3
field public static final int CONTENT_TYPE_MUSIC = 2; // 0x2 field public static final int CONTENT_TYPE_MUSIC = 2; // 0x2

3
api/system-current.txt
View File

@ -22627,7 +22627,8 @@ package android.media {
method public int getContentType(); method public int getContentType();
method public int getFlags(); method public int getFlags();
method public int getUsage(); method public int getUsage();
method public static int getVolumeControlStream(android.media.AudioAttributes); method public static deprecated int getVolumeControlStream(android.media.AudioAttributes);
method public int getVolumeControlStream();
method public void writeToParcel(android.os.Parcel, int); 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_MOVIE = 3; // 0x3
field public static final int CONTENT_TYPE_MUSIC = 2; // 0x2 field public static final int CONTENT_TYPE_MUSIC = 2; // 0x2

3
api/test-current.txt
View File

@ -21004,7 +21004,8 @@ package android.media {
method public int getContentType(); method public int getContentType();
method public int getFlags(); method public int getFlags();
method public int getUsage(); method public int getUsage();
method public static int getVolumeControlStream(android.media.AudioAttributes); method public static deprecated int getVolumeControlStream(android.media.AudioAttributes);
method public int getVolumeControlStream();
method public void writeToParcel(android.os.Parcel, int); 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_MOVIE = 3; // 0x3
field public static final int CONTENT_TYPE_MUSIC = 2; // 0x2 field public static final int CONTENT_TYPE_MUSIC = 2; // 0x2

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

@ -912,6 +912,8 @@ public final class AudioAttributes implements Parcelable {
return USAGE_UNKNOWN; return USAGE_UNKNOWN;
} }
} }
// TODO remove, replaced by non-static API getVolumeControlStream()
/** /**
* Returns the stream type matching the given attributes for volume control. * Returns the stream type matching the given attributes for volume control.
* Use this method to derive the stream type needed to configure the volume * Use this method to derive the stream type needed to configure the volume
@ -925,6 +927,7 @@ public final class AudioAttributes implements Parcelable {
* the attributes, or {@link AudioManager#USE_DEFAULT_STREAM_TYPE} if there isn't a direct * 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 * match. Note that <code>USE_DEFAULT_STREAM_TYPE</code> is not a valid value
* for {@link AudioManager#setStreamVolume(int, int, int)}. * for {@link AudioManager#setStreamVolume(int, int, int)}.
* @deprecated use {@link #getVolumeControlStream()}
*/ */
public static int getVolumeControlStream(@NonNull AudioAttributes aa) { public static int getVolumeControlStream(@NonNull AudioAttributes aa) {
if (aa == null) { if (aa == null) {
@ -933,6 +936,24 @@ public final class AudioAttributes implements Parcelable {
return toVolumeStreamType(true /*fromGetVolumeControlStream*/, aa); 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
* control slider in an {@link android.app.Activity} with
* {@link android.app.Activity#setVolumeControlStream(int)} for playback conducted with these
* attributes.
* <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} instead.
* @return a valid stream type for {@code Activity} 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} is not a valid value
* for {@link AudioManager#setStreamVolume(int, int, int)}.
*/
public int getVolumeControlStream() {
return toVolumeStreamType(true /*fromGetVolumeControlStream*/, this);
}
/** /**
* @hide * @hide
* Only use to get which stream type should be used for volume control, NOT for audio playback * Only use to get which stream type should be used for volume control, NOT for audio playback