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

Commit bfd7f564 authored by Wei Jia's avatar Wei Jia Committed by android-build-merger
Browse files

Merge "BufferingParams: add annotation @TestApi" into pi-dev 

am: fb052cc3

Change-Id: I292beb9a2e88c2ca680412002e82ec4426ec9cf6
parents df0975bb fb052cc3

api/test-current.txt

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

  }



  public final class BufferingParams implements android.os.Parcelable {

    method public int describeContents();

    method public int getInitialMarkMs();

    method public int getResumePlaybackMarkMs();

    method public void writeToParcel(android.os.Parcel, int);

    field public static final android.os.Parcelable.Creator<android.media.BufferingParams> CREATOR;

  }



  public static class BufferingParams.Builder {

    ctor public BufferingParams.Builder();

    ctor public BufferingParams.Builder(android.media.BufferingParams);

    method public android.media.BufferingParams build();

    method public android.media.BufferingParams.Builder setInitialMarkMs(int);

    method public android.media.BufferingParams.Builder setResumePlaybackMarkMs(int);

  }



  public class MediaPlayer implements android.media.AudioRouting android.media.VolumeAutomation {

    method public android.media.BufferingParams getBufferingParams();

    method public void setBufferingParams(android.media.BufferingParams);

  }



  public final class PlaybackParams implements android.os.Parcelable {

    method public int getAudioStretchMode();

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

media/java/android/media/BufferingParams.java

+2 −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;
@@ -63,6 +64,7 @@ import java.lang.annotation.RetentionPolicy; 
 * <p>Users should use {@link Builder} to change {@link BufferingParams}.

 * @hide

 */

@TestApi

public final class BufferingParams implements Parcelable {

    private static final int BUFFERING_NO_MARK = -1;

media/java/android/media/MediaPlayer.java

+3 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package android.media; 
import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.TestApi;

import android.app.ActivityThread;

import android.content.ContentProvider;

import android.content.ContentResolver;
@@ -1680,6 +1681,7 @@ public class MediaPlayer extends PlayerBase 
     * @hide

     */

    @NonNull

    @TestApi

    public native BufferingParams getBufferingParams();



    /**
@@ -1696,6 +1698,7 @@ public class MediaPlayer extends PlayerBase 
     * @throws IllegalArgumentException if params is invalid or not supported.

     * @hide

     */

    @TestApi

    public native void setBufferingParams(@NonNull BufferingParams params);



    /**