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

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

Browse Source
This commit is contained in:
TreeHugger Robot
2018-04-11 18:01:24 +00:00
committed by Android (Google) Code Review
parent c2375d9b3d 5d78d87493
commit fb052cc3c0
3 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
api/test-current.txt
View File

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

2
media/java/android/media/BufferingParams.java
View File

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

3
media/java/android/media/MediaPlayer.java
View File

@@ -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);
/**