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

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

Browse Source 
am: 17d5e9a028

Change-Id: I55e393d1abf4b2302f90945783791208e658c632
This commit is contained in:
Jean-Michel Trivi
2017-04-20 17:41:51 +00:00
committed by android-build-merger
parent 1957ffcfb4 17d5e9a028
commit 5c77eaffd0
4 changed files with 0 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -20930,7 +20930,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

1
api/system-current.txt
View File

@@ -22712,7 +22712,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

1
api/test-current.txt
View File

@@ -21037,7 +21037,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

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

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