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

Commit 30a0d291 authored by Andy Hung's avatar Andy Hung Committed by Android (Google) Code Review
Browse files

Merge "PlaybackParams: Add @TestApi annotation to access stretch mode" into pi-dev

parents 1cf0b6cb 8ec4be4b

api/test-current.txt

+5 −0
Original line number Diff line number Diff line
@@ -492,6 +492,11 @@ package android.media { 
    method public int getProgramId();

  }



  public final class PlaybackParams implements android.os.Parcelable {

    method public int getAudioStretchMode();

    method public android.media.PlaybackParams setAudioStretchMode(int);

  }



  public static final class VolumeShaper.Configuration.Builder {

    method public android.media.VolumeShaper.Configuration.Builder setOptionFlags(int);

  }

media/java/android/media/PlaybackParams.java

+3 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package android.media;



import android.annotation.IntDef;

import android.annotation.TestApi;

import android.os.Parcel;

import android.os.Parcelable;
@@ -151,6 +152,7 @@ public final class PlaybackParams implements Parcelable { 
     * @param audioStretchMode

     * @return this <code>PlaybackParams</code> instance.

     */

    @TestApi

    public PlaybackParams setAudioStretchMode(@AudioStretchMode int audioStretchMode) {

        mAudioStretchMode = audioStretchMode;

        mSet |= SET_AUDIO_STRETCH_MODE;
@@ -163,6 +165,7 @@ public final class PlaybackParams implements Parcelable { 
     * @return audio stretch mode

     * @throws IllegalStateException if the audio stretch mode is not set.

     */

    @TestApi

    public @AudioStretchMode int getAudioStretchMode() {

        if ((mSet & SET_AUDIO_STRETCH_MODE) == 0) {

            throw new IllegalStateException("audio stretch mode not set");