Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 847cef79 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by android-build-merger
Browse files

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

am: ce755800

Change-Id: If92d1355d0b3ee28ee7f3c51fdf8a736c6ce5f98
parents a1168412 ce755800

api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -20899,7 +20899,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

api/system-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -22642,7 +22642,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

api/test-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -21012,7 +21012,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

media/java/android/media/AudioAttributes.java

+0 −23
Original line number Diff line number Diff line
@@ -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