commit 30a0d29107ca22db78ef4e5c27b36b64c9bb2cfc
author Andy Hung <hunga@google.com> Mon Apr 09 16:49:52 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 09 16:49:52 2018 +0000
tree 5ff56716317ae034d9828b9d78520b3463444dc7
parent 1cf0b6cbfd056f848dd5837bcf9d18eb5f577a8e
parent 8ec4be4be98e1a791fecf3dee50c06198521a46f

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

api/test-current.txt

diff --git a/api/test-current.txt b/api/test-current.txt
index 3fd7836..94154c2 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -492,6 +492,11 @@
     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

diff --git a/media/java/android/media/PlaybackParams.java b/media/java/android/media/PlaybackParams.java
index 938a953..b85e4d0 100644
--- a/media/java/android/media/PlaybackParams.java
+++ b/media/java/android/media/PlaybackParams.java
@@ -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 @@
      * @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 @@
      * @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");