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

Merge "Revert "AudioAttributes: remove static getVolumeControlStream method"" into oc-dev

Browse Source
This commit is contained in:
Jean-Michel Trivi
2017-04-04 19:08:33 +00:00
committed by Android (Google) Code Review
parent f9340ca491 e4a9911b68
commit 6cf445bd3d
4 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -20913,6 +20913,7 @@ 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 deprecated int getVolumeControlStream(android.media.AudioAttributes);
method public int getVolumeControlStream(); 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

1
api/system-current.txt
View File

@@ -22654,6 +22654,7 @@ 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 deprecated int getVolumeControlStream(android.media.AudioAttributes);
method public int getVolumeControlStream(); 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

1
api/test-current.txt
View File

@@ -21026,6 +21026,7 @@ 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 deprecated int getVolumeControlStream(android.media.AudioAttributes);
method public int getVolumeControlStream(); 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

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

@@ -913,6 +913,29 @@ 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. * 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 * Use this method to derive the stream type needed to configure the volume